diff --git a/cmd/helm/init.go b/cmd/helm/init.go
index 3667031d8..4aeb64866 100644
--- a/cmd/helm/init.go
+++ b/cmd/helm/init.go
@@ -36,10 +36,10 @@ import (
 )
 
 const initDesc = `
-This command sets up local configuration in $HELM_HOME. It defaults to
- - $XDG_CONFIG_HOME/helm (default $HOME/.config/helm) on Linux;
- - %APPDATA%\helm on Windows and;
- - $HOME/Library/Preferences on OSX.
+This command sets up local configuration in $XDG_CONFIG_HOME/helm
+($HOME/.config/helm on Linux, %APPDATA%\helm on Windows and
+$HOME/Library/Preferences on OSX).
+NOTE: if there is old-style "$HOME/.helm" directory, it will be preffered.
 `
 
 const (
diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index f136b9d00..2cda3a59b 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -45,8 +45,8 @@ Common actions from this point include:
 
 Environment:
   $HELM_HOME          set an alternative location for Helm files. By default, these are stored in
-                      "$XDG_CONFIG_HOME/helm" (typically "$HOME/.config/helm") on Linux,
-                      "%APPDATA%\helm" on Windows and "$HOME/Library/Preferences" on OSX.
+                      "$XDG_CONFIG_DIR/helm" ("$HOME/.config/helm" on Linux,
+                      "%APPDATA%\helm" on Windows and "$HOME/Library/Preferences" on OSX).
                       NOTE: if there is old-style "$HOME/.helm" directory, it will be used.
   $HELM_DRIVER        set the backend storage driver. Values are: configmap, secret, memory
   $HELM_NO_PLUGINS    disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins.