diff --git a/cmd/helm/package.go b/cmd/helm/package.go
index acf0c5e55..db3ca7816 100644
--- a/cmd/helm/package.go
+++ b/cmd/helm/package.go
@@ -54,6 +54,10 @@ func runPackage(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	if filepath.Base(path) != ch.Metadata.Name {
+		return fmt.Errorf("directory name (%s) and Chart.yaml name (%s) must match.", filepath.Base(path), ch.Metadata.Name)
+	}
+
 	// Save to the current working directory.
 	cwd, err := os.Getwd()
 	if err != nil {