diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index f4f83cc75..0606c3b78 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -97,7 +97,7 @@ kind: Deployment
 metadata:
   name: {{ template "fullname" . }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   replicas: {{ .Values.replicaCount }}
   template:
@@ -128,7 +128,7 @@ kind: Service
 metadata:
   name: {{ template "fullname" . }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/pkg/chartutil/create_test.go b/pkg/chartutil/create_test.go
index ee88972f4..e8597a5fa 100644
--- a/pkg/chartutil/create_test.go
+++ b/pkg/chartutil/create_test.go
@@ -32,7 +32,7 @@ func TestCreate(t *testing.T) {
 	}
 	defer os.RemoveAll(tdir)
 
-	cf := &chart.Metadata{Name: "foo"}
+	cf := &chart.Metadata{Name: "foo", Version: "1.0.0+a056a76"}
 
 	c, err := Create(cf, tdir)
 	if err != nil {
@@ -83,7 +83,7 @@ func TestCreateFrom(t *testing.T) {
 	}
 	defer os.RemoveAll(tdir)
 
-	cf := &chart.Metadata{Name: "foo"}
+	cf := &chart.Metadata{Name: "foo", Version: "1.0.0+a056a76"}
 	srcdir := "./testdata/mariner"
 
 	if err := CreateFrom(cf, tdir, srcdir); err != nil {