diff --git a/docs/install.md b/docs/install.md
index 434ac72de..7486904d0 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -169,15 +169,12 @@ Server: &version.Version{SemVer:"v2.0.0-alpha.4", GitCommit:"a5...", GitTreeStat
 Importantly, even when running locally, Tiller will store release
 configuration in ConfigMaps inside of Kubernetes.
 
-## Deleting or Reinstalling Tiller
+## Upgrading Tiller
 
-Because Tiller stores its data in Kubernetes ConfigMaps, you can safely
-delete and re-install Tiller without worrying about losing any data. The
-recommended way of deleting Tiller is with `kubectl delete deployment
-tiller-deploy --namespace kube-system`
+As of Helm 2.2.0, Tiller can be upgraded using `helm init --upgrade`.
 
-To simply update Tiller to run the latest image, you can run this
-command:
+For older versions of Helm, or for manual upgrades, you can use `kubectl` to modify
+the Tiller image:
 
 ```console
 $ export TILLER_TAG=v2.0.0-beta.1        # Or whatever version you want
@@ -187,6 +184,19 @@ deployment "tiller-deploy" image updated
 
 Setting `TILLER_TAG=canary` will get the latest snapshot of master.
 
+## Deleting or Reinstalling Tiller
+
+Because Tiller stores its data in Kubernetes ConfigMaps, you can safely
+delete and re-install Tiller without worrying about losing any data. The
+recommended way of deleting Tiller is with `kubectl delete deployment
+tiller-deploy --namespace kube-system`
+
+Tiller can then be re-installed from the client with:
+
+```console
+$ helm init
+```
+
 ## Conclusion
 
 In most cases, installation is as simple as getting a pre-built `helm` binary
diff --git a/docs/quickstart.md b/docs/quickstart.md
index e2372168a..dcf266867 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -43,6 +43,8 @@ This will install Tiller into the Kubernetes cluster you saw with
 **TIP:** Want to install into a different cluster? Use the
 `--kube-context` flag.
 
+**TIP:** When you want to upgrade Tiller, just run `helm init --upgrade`.
+
 ## Install an Example Chart
 
 To install a chart, you can run the `helm install` command. Helm has