diff --git a/README.md b/README.md
index b9b3ac8..0366d22 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,9 @@ resource_types:
 * `admin_cert`: *Optional.* Base64 encoded PEM. Required if `cluster_url` is https and no `token` or 'token_path' is provided.
 * `release`: *Optional.* Name of the release (not a file, a string). (Default: autogenerated by helm)
 * `namespace`: *Optional.* Kubernetes namespace the chart will be installed into. (Default: default)
-* `tiller_namespace`: *Optional.* Kubernetes namespace where tiller is running. (Default: kube-system)
+* `helm_init_server`: *Optional.* Installs helm into the cluster if not already installed. (Default: false)
+* `tiller_namespace`: *Optional.* Kubernetes namespace where tiller is running (or will be installed to). (Default: kube-system)
+* `tiller_service_account`: *Optional* Name of the service account that tiller will use (only applies if helm_init_server is true).
 * `repos`: *Optional.* Array of Helm repositories to initialize, each repository is defined as an object with `name` and `url` properties.
 
 ## Behavior
diff --git a/assets/common.sh b/assets/common.sh
index e5d4354..d9609d1 100644
--- a/assets/common.sh
+++ b/assets/common.sh
@@ -48,12 +48,34 @@ setup_kubernetes() {
 }
 
 setup_helm() {
+  init_server=$(jq -r '.source.helm_init_server // "false"' < $1)
   tiller_namespace=$(jq -r '.source.tiller_namespace // "kube-system"' < $1)
 
-  helm init -c --tiller-namespace $tiller_namespace > /dev/nulll
+  if [ "$init_server" = true ]; then
+    tiller_service_account=$(jq -r '.source.tiller_service_account // "default"' < $1)
+    helm init --tiller-namespace=$tiller_namespace --service-account=$tiller_service_account --upgrade
+    wait_for_service_up tiller-deploy 10
+  else
+    helm init -c --tiller-namespace $tiller_namespace > /dev/nulll
+  fi
+
   helm version --tiller-namespace $tiller_namespace
 }
 
+wait_for_service_up() {
+  SERVICE=$1
+  TIMEOUT=$2
+  if [ "$TIMEOUT" -le "0" ]; then
+    echo "Service $SERVICE was not ready in time"
+    exit 1
+  fi
+  RESULT=`kubectl get endpoints --namespace=mario $SERVICE -o jsonpath={.subsets[].addresses[].targetRef.name} 2> /dev/null || true`
+  if [ -z "$RESULT" ]; then
+    delay 1000
+    wait_for_service_ready $SERVICE $((--TIMEOUT))
+  fi
+}
+
 setup_repos() {
   repos=$(jq -r '(try .source.repos[] catch [][]) | (.name+" "+.url)' < $1)
   tiller_namespace=$(jq -r '.source.tiller_namespace // "kube-system"' < $1)