diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index d3337404a..658eeb716 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -66,6 +66,7 @@ Environment:
 - $HELM_HOST:           set an alternative Tiller host. The format is host:port
 - $HELM_NO_PLUGINS:     disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins.
 - $TILLER_NAMESPACE:    set an alternative Tiller namespace (default "kube-system")
+- $TILLER_PORT:			set an alternative Tiller port (default "44134")
 - $KUBECONFIG:          set an alternative Kubernetes configuration file (default "~/.kube/config")
 - $HELM_TLS_CA_CERT:    path to TLS CA certificate used to verify the Helm client and Tiller server certificates (default "$HELM_HOME/ca.pem")
 - $HELM_TLS_CERT:       path to TLS client certificate file for authenticating to Tiller (default "$HELM_HOME/cert.pem")
@@ -190,7 +191,7 @@ func setupConnection() error {
 			return err
 		}
 
-		tillerTunnel, err = portforwarder.New(settings.TillerNamespace, client, config)
+		tillerTunnel, err = portforwarder.NewWithPort(settings.TillerNamespace, settings.TillerPort, client, config)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 83f1173f2..c0d61a2c3 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -256,6 +256,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -275,6 +276,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -294,6 +296,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -313,6 +316,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -332,6 +336,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -351,6 +356,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -370,6 +376,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -390,6 +397,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -410,6 +418,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -430,6 +439,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -450,6 +460,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -470,6 +481,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
@@ -490,6 +502,7 @@ func TestTLSFlags(t *testing.T) {
 				TillerHost:              "",
 				TillerConnectionTimeout: 300,
 				TillerNamespace:         "kube-system",
+				TillerPort:              44134,
 				Home:                    home,
 				Debug:                   false,
 				KubeContext:             "",
diff --git a/cmd/helm/plugin_test.go b/cmd/helm/plugin_test.go
index 2d06c3797..1c37a4a6b 100644
--- a/cmd/helm/plugin_test.go
+++ b/cmd/helm/plugin_test.go
@@ -158,6 +158,7 @@ func TestSetupEnv(t *testing.T) {
 	settings.Home = helmpath.Home("testdata/helmhome")
 	base := filepath.Join(settings.Home.Plugins(), name)
 	settings.Debug = true
+	settings.TillerPort = 44134
 	defer func() {
 		settings.Debug = false
 	}()
@@ -179,6 +180,7 @@ func TestSetupEnv(t *testing.T) {
 		{"HELM_PATH_STARTER", settings.Home.Starters()},
 		{"TILLER_HOST", settings.TillerHost},
 		{"TILLER_NAMESPACE", settings.TillerNamespace},
+		{"TILLER_PORT", string(settings.TillerPort)},
 	} {
 		if got := os.Getenv(tt.name); got != tt.expect {
 			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
diff --git a/docs/helm/helm.md b/docs/helm/helm.md
index b57be9f9d..deff1dea0 100644
--- a/docs/helm/helm.md
+++ b/docs/helm/helm.md
@@ -26,6 +26,7 @@ Environment:
 - $HELM_HOST:           set an alternative Tiller host. The format is host:port
 - $HELM_NO_PLUGINS:     disable plugins. Set HELM_NO_PLUGINS=1 to disable plugins.
 - $TILLER_NAMESPACE:    set an alternative Tiller namespace (default "kube-system")
+- $TILLER_PORT:			set an alternative Tiller port (default "44134")
 - $KUBECONFIG:          set an alternative Kubernetes configuration file (default "~/.kube/config")
 - $HELM_TLS_CA_CERT:    path to TLS CA certificate used to verify the Helm client and Tiller server certificates (default "$HELM_HOME/ca.pem")
 - $HELM_TLS_CERT:       path to TLS client certificate file for authenticating to Tiller (default "$HELM_HOME/cert.pem")
@@ -48,6 +49,7 @@ Environment:
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
@@ -79,4 +81,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 25-Apr-2019
+###### Auto generated by spf13/cobra on 20-May-2019
diff --git a/docs/helm/helm_completion.md b/docs/helm/helm_completion.md
index 440393076..3f46c4a6f 100644
--- a/docs/helm/helm_completion.md
+++ b/docs/helm/helm_completion.md
@@ -36,10 +36,11 @@ helm completion SHELL [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 2dc45a77c..7a58e8c3e 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -52,10 +52,11 @@ helm create NAME [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 18-Sep-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 3c6a46844..24a82708d 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -43,10 +43,11 @@ helm delete [flags] RELEASE_NAME [...]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_dependency.md b/docs/helm/helm_dependency.md
index 8c7d7d65f..9854de9f7 100644
--- a/docs/helm/helm_dependency.md
+++ b/docs/helm/helm_dependency.md
@@ -69,6 +69,7 @@ for this case.
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
@@ -78,4 +79,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 26-Mar-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_dependency_build.md b/docs/helm/helm_dependency_build.md
index 1df32d9ab..c38ce6927 100644
--- a/docs/helm/helm_dependency_build.md
+++ b/docs/helm/helm_dependency_build.md
@@ -14,6 +14,7 @@ If no lock file is found, 'helm dependency build' will mirror the behavior of
 the 'helm dependency update' command. This means it will update the on-disk
 dependencies to mirror the requirements.yaml file and generate a lock file.
 
+
 ```
 helm dependency build [flags] CHART
 ```
@@ -36,10 +37,11 @@ helm dependency build [flags] CHART
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_dependency_list.md b/docs/helm/helm_dependency_list.md
index da754c5d1..e268abd0b 100644
--- a/docs/helm/helm_dependency_list.md
+++ b/docs/helm/helm_dependency_list.md
@@ -34,10 +34,11 @@ helm dependency list [flags] CHART
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_dependency_update.md b/docs/helm/helm_dependency_update.md
index 88bf3fafd..7b4f3981e 100644
--- a/docs/helm/helm_dependency_update.md
+++ b/docs/helm/helm_dependency_update.md
@@ -42,10 +42,11 @@ helm dependency update [flags] CHART
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_fetch.md b/docs/helm/helm_fetch.md
index 81c0a9596..439c35791 100644
--- a/docs/helm/helm_fetch.md
+++ b/docs/helm/helm_fetch.md
@@ -53,10 +53,11 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_get.md b/docs/helm/helm_get.md
index 3ce0ff191..b03085152 100644
--- a/docs/helm/helm_get.md
+++ b/docs/helm/helm_get.md
@@ -45,6 +45,7 @@ helm get [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
diff --git a/docs/helm/helm_get_hooks.md b/docs/helm/helm_get_hooks.md
index d7097fd59..528f9c9e3 100644
--- a/docs/helm/helm_get_hooks.md
+++ b/docs/helm/helm_get_hooks.md
@@ -37,10 +37,11 @@ helm get hooks [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_get_manifest.md b/docs/helm/helm_get_manifest.md
index 60bfeac0b..6ea5fa38a 100644
--- a/docs/helm/helm_get_manifest.md
+++ b/docs/helm/helm_get_manifest.md
@@ -39,10 +39,11 @@ helm get manifest [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_get_notes.md b/docs/helm/helm_get_notes.md
index 076aaaa59..57dbd629d 100644
--- a/docs/helm/helm_get_notes.md
+++ b/docs/helm/helm_get_notes.md
@@ -35,10 +35,11 @@ helm get notes [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 1-Sep-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_get_values.md b/docs/helm/helm_get_values.md
index 87d21b954..6bd74b12d 100644
--- a/docs/helm/helm_get_values.md
+++ b/docs/helm/helm_get_values.md
@@ -37,10 +37,11 @@ helm get values [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 7-Sep-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_history.md b/docs/helm/helm_history.md
index 7f0a68928..5eaff8218 100755
--- a/docs/helm/helm_history.md
+++ b/docs/helm/helm_history.md
@@ -49,10 +49,11 @@ helm history [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_home.md b/docs/helm/helm_home.md
index 192302424..e15fcb4e9 100644
--- a/docs/helm/helm_home.md
+++ b/docs/helm/helm_home.md
@@ -29,10 +29,11 @@ helm home [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_init.md b/docs/helm/helm_init.md
index 72fd9e86b..4506aceae 100644
--- a/docs/helm/helm_init.md
+++ b/docs/helm/helm_init.md
@@ -69,10 +69,11 @@ helm init [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 4-Sep-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_inspect.md b/docs/helm/helm_inspect.md
index 8bdf1092d..ed38e99ba 100644
--- a/docs/helm/helm_inspect.md
+++ b/docs/helm/helm_inspect.md
@@ -41,6 +41,7 @@ helm inspect [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
@@ -50,4 +51,4 @@ helm inspect [CHART] [flags]
 * [helm inspect readme](helm_inspect_readme.md)	 - shows inspect readme
 * [helm inspect values](helm_inspect_values.md)	 - shows inspect values
 
-###### Auto generated by spf13/cobra on 8-Jan-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_inspect_chart.md b/docs/helm/helm_inspect_chart.md
index 1cd13fc72..882ac443d 100644
--- a/docs/helm/helm_inspect_chart.md
+++ b/docs/helm/helm_inspect_chart.md
@@ -39,10 +39,11 @@ helm inspect chart [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 8-Jan-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_inspect_readme.md b/docs/helm/helm_inspect_readme.md
index 9570d19d6..28db06567 100644
--- a/docs/helm/helm_inspect_readme.md
+++ b/docs/helm/helm_inspect_readme.md
@@ -37,10 +37,11 @@ helm inspect readme [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 8-Jan-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_inspect_values.md b/docs/helm/helm_inspect_values.md
index a634134dd..87e0f4ccd 100644
--- a/docs/helm/helm_inspect_values.md
+++ b/docs/helm/helm_inspect_values.md
@@ -39,10 +39,11 @@ helm inspect values [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 8-Jan-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 12ae81b78..63a93a86a 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -124,10 +124,11 @@ helm install [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 28-Jan-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index bf168184e..5a8965a32 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -39,10 +39,11 @@ helm lint [flags] PATH
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index 5087c8a59..765433443 100755
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -72,10 +72,11 @@ helm list [flags] [FILTER]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Sep-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_package.md b/docs/helm/helm_package.md
index b772fa70c..adb2f76c8 100644
--- a/docs/helm/helm_package.md
+++ b/docs/helm/helm_package.md
@@ -43,10 +43,11 @@ helm package [flags] [CHART_PATH] [...]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_plugin.md b/docs/helm/helm_plugin.md
index 5aa57b69c..c5522e44e 100644
--- a/docs/helm/helm_plugin.md
+++ b/docs/helm/helm_plugin.md
@@ -24,6 +24,7 @@ Manage client-side Helm plugins.
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
@@ -34,4 +35,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 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_plugin_install.md b/docs/helm/helm_plugin_install.md
index f30bfff55..3b1b60714 100644
--- a/docs/helm/helm_plugin_install.md
+++ b/docs/helm/helm_plugin_install.md
@@ -32,10 +32,11 @@ helm plugin install [options] <path|url>... [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_plugin_list.md b/docs/helm/helm_plugin_list.md
index 373462e2b..4f15425ee 100644
--- a/docs/helm/helm_plugin_list.md
+++ b/docs/helm/helm_plugin_list.md
@@ -26,10 +26,11 @@ helm plugin list [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_plugin_remove.md b/docs/helm/helm_plugin_remove.md
index 30f222c9f..5258e19b6 100644
--- a/docs/helm/helm_plugin_remove.md
+++ b/docs/helm/helm_plugin_remove.md
@@ -26,10 +26,11 @@ helm plugin remove <plugin>... [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_plugin_update.md b/docs/helm/helm_plugin_update.md
index 65b16cd9d..a5bdedc95 100644
--- a/docs/helm/helm_plugin_update.md
+++ b/docs/helm/helm_plugin_update.md
@@ -26,10 +26,11 @@ helm plugin update <plugin>... [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo.md b/docs/helm/helm_repo.md
index 0b73fbcd0..adbe50cd5 100644
--- a/docs/helm/helm_repo.md
+++ b/docs/helm/helm_repo.md
@@ -28,6 +28,7 @@ Example usage:
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
@@ -39,4 +40,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 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo_add.md b/docs/helm/helm_repo_add.md
index 29947147d..f39988463 100644
--- a/docs/helm/helm_repo_add.md
+++ b/docs/helm/helm_repo_add.md
@@ -32,10 +32,11 @@ helm repo add [flags] [NAME] [URL]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo_index.md b/docs/helm/helm_repo_index.md
index 4660489f9..6b4fb52f5 100644
--- a/docs/helm/helm_repo_index.md
+++ b/docs/helm/helm_repo_index.md
@@ -37,10 +37,11 @@ helm repo index [flags] [DIR]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo_list.md b/docs/helm/helm_repo_list.md
index bebaa6333..685e11c4b 100644
--- a/docs/helm/helm_repo_list.md
+++ b/docs/helm/helm_repo_list.md
@@ -26,10 +26,11 @@ helm repo list [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo_remove.md b/docs/helm/helm_repo_remove.md
index 89f43a130..2f40b4354 100644
--- a/docs/helm/helm_repo_remove.md
+++ b/docs/helm/helm_repo_remove.md
@@ -26,10 +26,11 @@ helm repo remove [flags] [NAME]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_repo_update.md b/docs/helm/helm_repo_update.md
index 381c12fb3..4a0f6a140 100644
--- a/docs/helm/helm_repo_update.md
+++ b/docs/helm/helm_repo_update.md
@@ -33,10 +33,11 @@ helm repo update [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 15-Nov-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md
index 772ac42c3..4a834005e 100644
--- a/docs/helm/helm_reset.md
+++ b/docs/helm/helm_reset.md
@@ -38,10 +38,11 @@ helm reset [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index 87c68f6c8..5c4ea0ccb 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -47,10 +47,11 @@ helm rollback [flags] [RELEASE] [REVISION]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 5-Feb-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_search.md b/docs/helm/helm_search.md
index c45a397e3..ab0944374 100644
--- a/docs/helm/helm_search.md
+++ b/docs/helm/helm_search.md
@@ -35,10 +35,11 @@ helm search [keyword] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md
index 62a68595a..a578d7b29 100644
--- a/docs/helm/helm_serve.md
+++ b/docs/helm/helm_serve.md
@@ -42,10 +42,11 @@ helm serve [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_status.md b/docs/helm/helm_status.md
index 9dca005fd..29d5c4b2a 100644
--- a/docs/helm/helm_status.md
+++ b/docs/helm/helm_status.md
@@ -43,10 +43,11 @@ helm status [flags] RELEASE_NAME
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index 805556096..abe630e0d 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -49,10 +49,11 @@ helm template [flags] CHART
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 1-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_test.md b/docs/helm/helm_test.md
index e8ddfbc9b..d2b601102 100644
--- a/docs/helm/helm_test.md
+++ b/docs/helm/helm_test.md
@@ -40,10 +40,11 @@ helm test [RELEASE] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 9-Nov-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index d54b7c3a2..741049eea 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -112,10 +112,11 @@ helm upgrade [RELEASE] [CHART] [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 5-Feb-2019
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/docs/helm/helm_verify.md b/docs/helm/helm_verify.md
index e6d683dfb..43e02b406 100644
--- a/docs/helm/helm_verify.md
+++ b/docs/helm/helm_verify.md
@@ -36,10 +36,11 @@ helm verify [flags] PATH
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 25-Feb-2019
+###### Auto generated by spf13/cobra on 20-May-2019
diff --git a/docs/helm/helm_version.md b/docs/helm/helm_version.md
index 33d33cf12..ffa7b4c07 100644
--- a/docs/helm/helm_version.md
+++ b/docs/helm/helm_version.md
@@ -52,10 +52,11 @@ helm version [flags]
       --kubeconfig string               absolute path to the kubeconfig file to use
       --tiller-connection-timeout int   the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
       --tiller-namespace string         namespace of Tiller (default "kube-system")
+      --tiller-port int                 port of Tiller (default 44134)
 ```
 
 ### SEE ALSO
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 10-Aug-2018
+###### Auto generated by spf13/cobra on 11-Apr-2019
diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go
index 6d40fb846..5d0ad4c6b 100644
--- a/pkg/helm/environment/environment.go
+++ b/pkg/helm/environment/environment.go
@@ -56,6 +56,8 @@ type EnvSettings struct {
 	TillerConnectionTimeout int64
 	// TillerNamespace is the namespace in which Tiller runs.
 	TillerNamespace string
+	// TillerPort is the port on which Tiller runs.
+	TillerPort int
 	// Home is the local path to the Helm home directory.
 	Home helmpath.Home
 	// Debug indicates whether or not Helm is running in Debug mode.
@@ -86,6 +88,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.KubeConfig, "kubeconfig", "", "absolute path to the kubeconfig file to use")
 	fs.BoolVar(&s.Debug, "debug", false, "enable verbose output")
 	fs.StringVar(&s.TillerNamespace, "tiller-namespace", "kube-system", "namespace of Tiller")
+	fs.IntVar(&s.TillerPort, "tiller-port", 44134, "port of Tiller")
 	fs.Int64Var(&s.TillerConnectionTimeout, "tiller-connection-timeout", int64(300), "the duration (in seconds) Helm will wait to establish a connection to tiller")
 }
 
@@ -119,6 +122,7 @@ var envMap = map[string]string{
 	"home":             "HELM_HOME",
 	"host":             "HELM_HOST",
 	"tiller-namespace": "TILLER_NAMESPACE",
+	"tiller-port":      "TILLER_PORT",
 }
 
 var tlsEnvMap = map[string]string{
diff --git a/pkg/helm/environment/environment_test.go b/pkg/helm/environment/environment_test.go
index 675582cf6..46688441f 100644
--- a/pkg/helm/environment/environment_test.go
+++ b/pkg/helm/environment/environment_test.go
@@ -36,6 +36,7 @@ func TestEnvSettings(t *testing.T) {
 
 		// expected values
 		home, host, ns, kcontext, kconfig, plugins string
+		port                                       int
 		debug, tlsverify                           bool
 	}{
 		{
@@ -44,15 +45,17 @@ func TestEnvSettings(t *testing.T) {
 			home:      DefaultHelmHome,
 			plugins:   helmpath.Home(DefaultHelmHome).Plugins(),
 			ns:        "kube-system",
+			port:      44134,
 			tlsverify: false,
 		},
 		{
 			name:      "with flags set",
-			args:      []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns", "--kubeconfig", "/bar"},
+			args:      []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns", "--tiller-port=44225", "--kubeconfig", "/bar"},
 			home:      "/foo",
 			plugins:   helmpath.Home("/foo").Plugins(),
 			host:      "here",
 			ns:        "myns",
+			port:      44225,
 			kconfig:   "/bar",
 			debug:     true,
 			tlsverify: false,
@@ -60,33 +63,36 @@ func TestEnvSettings(t *testing.T) {
 		{
 			name:      "with envvars set",
 			args:      []string{},
-			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns"},
+			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns", "TILLER_PORT": "44225"},
 			home:      "/bar",
 			plugins:   helmpath.Home("/bar").Plugins(),
 			host:      "there",
 			ns:        "yourns",
+			port:      44225,
 			debug:     true,
 			tlsverify: false,
 		},
 		{
 			name:      "with TLS envvars set",
 			args:      []string{},
-			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns", "HELM_TLS_VERIFY": "1"},
+			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns", "TILLER_PORT": "44225", "HELM_TLS_VERIFY": "1"},
 			home:      "/bar",
 			plugins:   helmpath.Home("/bar").Plugins(),
 			host:      "there",
 			ns:        "yourns",
+			port:      44225,
 			debug:     true,
 			tlsverify: true,
 		},
 		{
 			name:      "with flags and envvars set",
 			args:      []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns"},
-			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns", "HELM_PLUGIN": "glade"},
+			envars:    map[string]string{"HELM_HOME": "/bar", "HELM_HOST": "there", "HELM_DEBUG": "1", "TILLER_NAMESPACE": "yourns", "TILLER_PORT": "44225", "HELM_PLUGIN": "glade"},
 			home:      "/foo",
 			plugins:   "glade",
 			host:      "here",
 			ns:        "myns",
+			port:      44225,
 			debug:     true,
 			tlsverify: false,
 		},
@@ -97,6 +103,7 @@ func TestEnvSettings(t *testing.T) {
 		"HELM_HOME":         "",
 		"HELM_HOST":         "",
 		"TILLER_NAMESPACE":  "",
+		"TILLER_PORT":       "",
 		"HELM_PLUGIN":       "",
 		"HELM_TLS_HOSTNAME": "",
 		"HELM_TLS_CA_CERT":  "",
@@ -140,6 +147,9 @@ func TestEnvSettings(t *testing.T) {
 			if settings.TillerNamespace != tt.ns {
 				t.Errorf("expected tiller-namespace %q, got %q", tt.ns, settings.TillerNamespace)
 			}
+			if settings.TillerPort != tt.port {
+				t.Errorf("expected tiller-port %d, got %d", tt.port, settings.TillerPort)
+			}
 			if settings.KubeContext != tt.kcontext {
 				t.Errorf("expected kube-context %q, got %q", tt.kcontext, settings.KubeContext)
 			}
diff --git a/pkg/helm/portforwarder/portforwarder.go b/pkg/helm/portforwarder/portforwarder.go
index 0b04478f5..881794d6a 100644
--- a/pkg/helm/portforwarder/portforwarder.go
+++ b/pkg/helm/portforwarder/portforwarder.go
@@ -19,7 +19,7 @@ package portforwarder
 import (
 	"fmt"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
@@ -27,7 +27,6 @@ import (
 	"k8s.io/client-go/rest"
 
 	"k8s.io/helm/pkg/kube"
-	"k8s.io/helm/pkg/tiller/environment"
 )
 
 var (
@@ -36,11 +35,17 @@ var (
 
 // New creates a new and initialized tunnel.
 func New(namespace string, client kubernetes.Interface, config *rest.Config) (*kube.Tunnel, error) {
+	const tillerPort = 44134
+	return NewWithPort(namespace, tillerPort, client, config)
+}
+
+// NewWithPort creates a new and initialized tunnel on the specified port.
+func NewWithPort(namespace string, port int, client kubernetes.Interface, config *rest.Config) (*kube.Tunnel, error) {
 	podName, err := GetTillerPodName(client.CoreV1(), namespace)
 	if err != nil {
 		return nil, err
 	}
-	t := kube.NewTunnel(client.CoreV1().RESTClient(), config, namespace, podName, environment.DefaultTillerPort)
+	t := kube.NewTunnel(client.CoreV1().RESTClient(), config, namespace, podName, port)
 	return t, t.ForwardPort()
 }
 
diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index 07fcc700a..c6813e545 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -190,6 +190,7 @@ func SetupPluginEnv(settings helm_env.EnvSettings,
 
 		"TILLER_HOST":      settings.TillerHost,
 		"TILLER_NAMESPACE": settings.TillerNamespace,
+		"TILLER_PORT":      string(settings.TillerPort),
 	} {
 		os.Setenv(key, val)
 	}