diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index b475c79638f0cad12cb8be38ee53346f32c7aa42..d838f0b7fe4512a06510e5cf637cece8b975164f 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -32,7 +32,6 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/strvals"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/downloader"
 	"k8s.io/helm/pkg/helm"
@@ -40,6 +39,7 @@ import (
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/strvals"
 )
 
 const installDesc = `
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index 0c302cc329af7c1190ad8607306958ca619ea04e..a05891e5d08f6876f7f9b17b4ee106de2a8ebfac 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -25,10 +25,10 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/strvals"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/storage/driver"
+	"k8s.io/helm/pkg/strvals"
 )
 
 const upgradeDesc = `
diff --git a/cmd/helm/strvals/doc.go b/pkg/strvals/doc.go
similarity index 100%
rename from cmd/helm/strvals/doc.go
rename to pkg/strvals/doc.go
diff --git a/cmd/helm/strvals/parser.go b/pkg/strvals/parser.go
similarity index 100%
rename from cmd/helm/strvals/parser.go
rename to pkg/strvals/parser.go
diff --git a/cmd/helm/strvals/parser_test.go b/pkg/strvals/parser_test.go
similarity index 100%
rename from cmd/helm/strvals/parser_test.go
rename to pkg/strvals/parser_test.go