diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 9bc98792e..6412057b8 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -216,7 +216,7 @@ func prettyError(err error) error {
 
 // configForContext creates a Kubernetes REST client configuration for a given kubeconfig context.
 func configForContext(context string) (*rest.Config, error) {
-	config, err := kube.GetConfig(context).ClientConfig()
+	config, err := kube.GetConfig(context, settings.KubeConfig).ClientConfig()
 	if err != nil {
 		return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err)
 	}
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 9858a85fe..1ed179d57 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -460,7 +460,7 @@ func generateName(nameTemplate string) (string, error) {
 }
 
 func defaultNamespace() string {
-	if ns, _, err := kube.GetConfig(settings.KubeContext).Namespace(); err == nil {
+	if ns, _, err := kube.GetConfig(settings.KubeContext, settings.KubeConfig).Namespace(); err == nil {
 		return ns
 	}
 	return "default"
diff --git a/docs/helm/helm.md b/docs/helm/helm.md
index 36e41835e..0b0eb37de 100644
--- a/docs/helm/helm.md
+++ b/docs/helm/helm.md
@@ -36,6 +36,7 @@ Environment:
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -67,4 +68,4 @@ Environment:
 * [helm verify](helm_verify.md)	 - verify that a chart at the given path has been signed and is valid
 * [helm version](helm_version.md)	 - print the client/server version information
 
-###### Auto generated by spf13/cobra on 8-Aug-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_completion.md b/docs/helm/helm_completion.md
index 60cc7497c..68d227198 100644
--- a/docs/helm/helm_completion.md
+++ b/docs/helm/helm_completion.md
@@ -28,10 +28,11 @@ helm completion SHELL
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 73d435d6c..4719e45d3 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -47,10 +47,11 @@ helm create NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 91fc51c22..5540736ad 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -38,10 +38,11 @@ helm delete [flags] RELEASE_NAME [...]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_dependency.md b/docs/helm/helm_dependency.md
index d7259c2f6..1b8b685e4 100644
--- a/docs/helm/helm_dependency.md
+++ b/docs/helm/helm_dependency.md
@@ -61,6 +61,7 @@ for this case.
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -70,4 +71,4 @@ for this case.
 * [helm dependency list](helm_dependency_list.md)	 - list the dependencies for the given chart
 * [helm dependency update](helm_dependency_update.md)	 - update charts/ based on the contents of requirements.yaml
 
-###### Auto generated by spf13/cobra on 11-Jul-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_dependency_build.md b/docs/helm/helm_dependency_build.md
index d99eb0ea3..b16d56a58 100644
--- a/docs/helm/helm_dependency_build.md
+++ b/docs/helm/helm_dependency_build.md
@@ -34,10 +34,11 @@ helm dependency build [flags] CHART
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_dependency_list.md b/docs/helm/helm_dependency_list.md
index 74e4fb80e..8003b79f4 100644
--- a/docs/helm/helm_dependency_list.md
+++ b/docs/helm/helm_dependency_list.md
@@ -26,10 +26,11 @@ helm dependency list [flags] CHART
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_dependency_update.md b/docs/helm/helm_dependency_update.md
index 2fa782c34..2ed84ec15 100644
--- a/docs/helm/helm_dependency_update.md
+++ b/docs/helm/helm_dependency_update.md
@@ -39,10 +39,11 @@ helm dependency update [flags] CHART
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_fetch.md b/docs/helm/helm_fetch.md
index 6bb3279c4..a8de1f446 100644
--- a/docs/helm/helm_fetch.md
+++ b/docs/helm/helm_fetch.md
@@ -48,10 +48,11 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Aug-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_get.md b/docs/helm/helm_get.md
index 418566c78..0b8fc73fd 100644
--- a/docs/helm/helm_get.md
+++ b/docs/helm/helm_get.md
@@ -40,6 +40,7 @@ helm get [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -49,4 +50,4 @@ helm get [flags] RELEASE_NAME
 * [helm get manifest](helm_get_manifest.md)	 - download the manifest for a named release
 * [helm get values](helm_get_values.md)	 - download the values file for a named release
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_get_hooks.md b/docs/helm/helm_get_hooks.md
index c90d5a5e4..3e94b014a 100644
--- a/docs/helm/helm_get_hooks.md
+++ b/docs/helm/helm_get_hooks.md
@@ -28,10 +28,11 @@ helm get hooks [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_get_manifest.md b/docs/helm/helm_get_manifest.md
index 294ae9528..4c802a7f3 100644
--- a/docs/helm/helm_get_manifest.md
+++ b/docs/helm/helm_get_manifest.md
@@ -30,10 +30,11 @@ helm get manifest [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_get_values.md b/docs/helm/helm_get_values.md
index 7067d8ac0..57c344ef6 100644
--- a/docs/helm/helm_get_values.md
+++ b/docs/helm/helm_get_values.md
@@ -27,10 +27,11 @@ helm get values [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_history.md b/docs/helm/helm_history.md
index afd411515..7dfacc08b 100644
--- a/docs/helm/helm_history.md
+++ b/docs/helm/helm_history.md
@@ -43,10 +43,11 @@ helm history [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_home.md b/docs/helm/helm_home.md
index c5c4f50e3..2e7054e05 100644
--- a/docs/helm/helm_home.md
+++ b/docs/helm/helm_home.md
@@ -21,10 +21,11 @@ helm home
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_init.md b/docs/helm/helm_init.md
index 0085f6cde..f6408dd99 100644
--- a/docs/helm/helm_init.md
+++ b/docs/helm/helm_init.md
@@ -61,10 +61,11 @@ helm init
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Oct-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_inspect.md b/docs/helm/helm_inspect.md
index a740c3b27..5219eaa33 100644
--- a/docs/helm/helm_inspect.md
+++ b/docs/helm/helm_inspect.md
@@ -35,6 +35,7 @@ helm inspect [CHART]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -43,4 +44,4 @@ helm inspect [CHART]
 * [helm inspect chart](helm_inspect_chart.md)	 - shows inspect chart
 * [helm inspect values](helm_inspect_values.md)	 - shows inspect values
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_inspect_chart.md b/docs/helm/helm_inspect_chart.md
index e9d5bc08c..36bd6df98 100644
--- a/docs/helm/helm_inspect_chart.md
+++ b/docs/helm/helm_inspect_chart.md
@@ -33,10 +33,11 @@ helm inspect chart [CHART]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_inspect_values.md b/docs/helm/helm_inspect_values.md
index a151c404b..d2d345b9b 100644
--- a/docs/helm/helm_inspect_values.md
+++ b/docs/helm/helm_inspect_values.md
@@ -33,10 +33,11 @@ helm inspect values [CHART]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 7596688e1..17963a06e 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -101,10 +101,11 @@ helm install [CHART]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 15-Aug-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index 618d5c5e2..1a8ddb0cd 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -31,10 +31,11 @@ helm lint [flags] PATH
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index f32233756..9b13f887f 100644
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -65,10 +65,11 @@ helm list [flags] [FILTER]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 12-Jul-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_package.md b/docs/helm/helm_package.md
index 88374b737..09513e793 100644
--- a/docs/helm/helm_package.md
+++ b/docs/helm/helm_package.md
@@ -39,10 +39,11 @@ helm package [flags] [CHART_PATH] [...]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_plugin.md b/docs/helm/helm_plugin.md
index 79653f5de..ce21e2b68 100644
--- a/docs/helm/helm_plugin.md
+++ b/docs/helm/helm_plugin.md
@@ -16,6 +16,7 @@ Manage client-side Helm plugins.
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -26,4 +27,4 @@ Manage client-side Helm plugins.
 * [helm plugin remove](helm_plugin_remove.md)	 - remove one or more Helm plugins
 * [helm plugin update](helm_plugin_update.md)	 - update one or more Helm plugins
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_plugin_install.md b/docs/helm/helm_plugin_install.md
index 635e68fff..03dc3c024 100644
--- a/docs/helm/helm_plugin_install.md
+++ b/docs/helm/helm_plugin_install.md
@@ -24,10 +24,11 @@ helm plugin install [options] <path|url>...
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_plugin_list.md b/docs/helm/helm_plugin_list.md
index 823f4369b..134eac58f 100644
--- a/docs/helm/helm_plugin_list.md
+++ b/docs/helm/helm_plugin_list.md
@@ -18,10 +18,11 @@ helm plugin list
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_plugin_remove.md b/docs/helm/helm_plugin_remove.md
index 8d02ee751..8dc301d3b 100644
--- a/docs/helm/helm_plugin_remove.md
+++ b/docs/helm/helm_plugin_remove.md
@@ -18,10 +18,11 @@ helm plugin remove <plugin>...
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_plugin_update.md b/docs/helm/helm_plugin_update.md
index 9817c052b..5d786b01c 100644
--- a/docs/helm/helm_plugin_update.md
+++ b/docs/helm/helm_plugin_update.md
@@ -18,10 +18,11 @@ helm plugin update <plugin>...
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo.md b/docs/helm/helm_repo.md
index 06cc1f4b2..2a2d67cec 100644
--- a/docs/helm/helm_repo.md
+++ b/docs/helm/helm_repo.md
@@ -20,6 +20,7 @@ Example usage:
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
@@ -31,4 +32,4 @@ Example usage:
 * [helm repo remove](helm_repo_remove.md)	 - remove a chart repository
 * [helm repo update](helm_repo_update.md)	 - update information of available charts locally from chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo_add.md b/docs/helm/helm_repo_add.md
index 34e1c5b8c..5f8247fba 100644
--- a/docs/helm/helm_repo_add.md
+++ b/docs/helm/helm_repo_add.md
@@ -27,10 +27,11 @@ helm repo add [flags] [NAME] [URL]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo_index.md b/docs/helm/helm_repo_index.md
index 533e38848..a9f407a02 100644
--- a/docs/helm/helm_repo_index.md
+++ b/docs/helm/helm_repo_index.md
@@ -34,10 +34,11 @@ helm repo index [flags] [DIR]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo_list.md b/docs/helm/helm_repo_list.md
index f4ab740af..ee156ea66 100644
--- a/docs/helm/helm_repo_list.md
+++ b/docs/helm/helm_repo_list.md
@@ -18,10 +18,11 @@ helm repo list [flags]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo_remove.md b/docs/helm/helm_repo_remove.md
index 0198f9618..4620b30d0 100644
--- a/docs/helm/helm_repo_remove.md
+++ b/docs/helm/helm_repo_remove.md
@@ -18,10 +18,11 @@ helm repo remove [flags] [NAME]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_repo_update.md b/docs/helm/helm_repo_update.md
index 61cca84eb..85399bf17 100644
--- a/docs/helm/helm_repo_update.md
+++ b/docs/helm/helm_repo_update.md
@@ -24,10 +24,11 @@ helm repo update
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md
index 78218a4e9..122d49cf3 100644
--- a/docs/helm/helm_reset.md
+++ b/docs/helm/helm_reset.md
@@ -34,10 +34,11 @@ helm reset
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 27-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index 53baef487..8a6a0f558 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -40,10 +40,11 @@ helm rollback [flags] [RELEASE] [REVISION]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_search.md b/docs/helm/helm_search.md
index 8522e4867..e81aa515f 100644
--- a/docs/helm/helm_search.md
+++ b/docs/helm/helm_search.md
@@ -31,10 +31,11 @@ helm search [keyword]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md
index 989694103..73e8467ff 100644
--- a/docs/helm/helm_serve.md
+++ b/docs/helm/helm_serve.md
@@ -39,10 +39,11 @@ helm serve
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_status.md b/docs/helm/helm_status.md
index 82fa9faec..38c78d296 100644
--- a/docs/helm/helm_status.md
+++ b/docs/helm/helm_status.md
@@ -38,10 +38,11 @@ helm status [flags] RELEASE_NAME
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index adfffa269..0a66145ac 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -42,10 +42,11 @@ helm template [flags] CHART
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 11-Sep-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_test.md b/docs/helm/helm_test.md
index ae6f3e0cd..c95c12a15 100644
--- a/docs/helm/helm_test.md
+++ b/docs/helm/helm_test.md
@@ -35,10 +35,11 @@ helm test [RELEASE]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index 07927523f..fe3eef6ef 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -70,10 +70,11 @@ helm upgrade [RELEASE] [CHART]
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 15-Aug-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_verify.md b/docs/helm/helm_verify.md
index cd967c52e..4153c1235 100644
--- a/docs/helm/helm_verify.md
+++ b/docs/helm/helm_verify.md
@@ -33,10 +33,11 @@ helm verify [flags] PATH
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/docs/helm/helm_version.md b/docs/helm/helm_version.md
index 3b55fafa0..74fe86d9f 100644
--- a/docs/helm/helm_version.md
+++ b/docs/helm/helm_version.md
@@ -47,10 +47,11 @@ helm version
       --home string               location of your Helm config. Overrides $HELM_HOME (default "$HOME/.helm")
       --host string               address of Tiller. Overrides $HELM_HOST
       --kube-context string       name of the kubeconfig context to use
+      --kubeconfig string         path to kubeconfig file. Overrides $KUBECONFIG
       --tiller-namespace string   namespace of Tiller (default "kube-system")
 ```
 
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 23-Jun-2017
+###### Auto generated by spf13/cobra on 1-Nov-2017
diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go
index 3ddd90449..e72710064 100644
--- a/pkg/helm/environment/environment.go
+++ b/pkg/helm/environment/environment.go
@@ -46,6 +46,8 @@ type EnvSettings struct {
 	Debug bool
 	// KubeContext is the name of the kubeconfig context.
 	KubeContext string
+	// KubeConfig is the name of the kubeconfig file.
+	KubeConfig string
 }
 
 // AddFlags binds flags to the given flagset.
@@ -53,6 +55,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar((*string)(&s.Home), "home", DefaultHelmHome, "location of your Helm config. Overrides $HELM_HOME")
 	fs.StringVar(&s.TillerHost, "host", "", "address of Tiller. Overrides $HELM_HOST")
 	fs.StringVar(&s.KubeContext, "kube-context", "", "name of the kubeconfig context to use")
+	fs.StringVar(&s.KubeConfig, "kubeconfig", "", "path to kubeconfig file. Overrides $KUBECONFIG")
 	fs.BoolVar(&s.Debug, "debug", false, "enable verbose output")
 	fs.StringVar(&s.TillerNamespace, "tiller-namespace", "kube-system", "namespace of Tiller")
 }
@@ -77,6 +80,7 @@ var envMap = map[string]string{
 	"debug":            "HELM_DEBUG",
 	"home":             "HELM_HOME",
 	"host":             "HELM_HOST",
+	"kubeconfig":       "KUBECONFIG",
 	"tiller-namespace": "TILLER_NAMESPACE",
 }
 
diff --git a/pkg/kube/config.go b/pkg/kube/config.go
index b6560486e..541d4eba6 100644
--- a/pkg/kube/config.go
+++ b/pkg/kube/config.go
@@ -19,7 +19,7 @@ package kube // import "k8s.io/helm/pkg/kube"
 import "k8s.io/client-go/tools/clientcmd"
 
 // GetConfig returns a Kubernetes client config for a given context.
-func GetConfig(context string) clientcmd.ClientConfig {
+func GetConfig(context string, kubeconfig string) clientcmd.ClientConfig {
 	rules := clientcmd.NewDefaultClientConfigLoadingRules()
 	rules.DefaultClientConfig = &clientcmd.DefaultClientConfig
 
@@ -28,5 +28,10 @@ func GetConfig(context string) clientcmd.ClientConfig {
 	if context != "" {
 		overrides.CurrentContext = context
 	}
+
+	if kubeconfig != "" {
+		rules.ExplicitPath = kubeconfig
+	}
+
 	return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, overrides)
 }