diff --git a/.bash_completion.d/helm b/.bash_completion.d/helm
new file mode 100644
index 0000000000000000000000000000000000000000..62800233fb097fc4301d6553068f23abade1ca9d
--- /dev/null
+++ b/.bash_completion.d/helm
@@ -0,0 +1 @@
+command -v helm >/dev/null && eval "$(helm completion bash)"
diff --git a/Makefile b/Makefile
index 99bf1f8570198413c7704a9e2a2cfd78a75115ae..024b4a4d84889bc796b7d113964f6ecd2b027e43 100644
--- a/Makefile
+++ b/Makefile
@@ -79,3 +79,7 @@ binaries: .local/share/bfg/bfg.jar .local/bin/rke .local/bin/docker-machine .loc
 .local/bin/docker-machine-driver-kvm2:
 	$(download) https://storage.googleapis.com/minikube/releases/latest/docker-machine-driver-kvm2
 	chmod +x $@
+
+.local/bin/helm:
+	$(curl) https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-$(os)-$(arch).tar.gz | tar -C .local/bin --wildcards --strip-components=1 -zx */helm
+	chmod +x $@