diff --git a/completion/available/heroku.completion.bash b/completion/available/heroku.completion.bash
new file mode 100644
index 00000000..54ef8675
--- /dev/null
+++ b/completion/available/heroku.completion.bash
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+
+if command -v heroku > /dev/null; then
+    heroku autocomplete > /dev/null
+    printf "$(heroku autocomplete:script bash)" >> ~/.bashrc; source ~/.bashrc
+fi
+