diff --git a/stack.sh b/stack.sh
index 585d1ceaf6..37b4e2853f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1312,6 +1312,13 @@ fi
 service_check
 
 
+# Bash completion
+# ===============
+
+# Prepare bash completion for OSC
+openstack complete | sudo tee /etc/bash_completion.d/osc.bash_completion > /dev/null
+
+
 # Fin
 # ===