diff --git a/libexec/rbenv-completions b/libexec/rbenv-completions
index 4cb020cf..19551c2e 100755
--- a/libexec/rbenv-completions
+++ b/libexec/rbenv-completions
@@ -10,6 +10,11 @@ if [ -z "$COMMAND" ]; then
   exit 1
 fi
 
+# Provide rbenv completions
+if [ "$COMMAND" = "--complete" ]; then
+  exec rbenv-commands
+fi
+
 COMMAND_PATH="$(command -v "rbenv-$COMMAND" || command -v "rbenv-sh-$COMMAND")"
 
 # --help is provided automatically
diff --git a/libexec/rbenv-help b/libexec/rbenv-help
index 13bdcf1b..c899cf0d 100755
--- a/libexec/rbenv-help
+++ b/libexec/rbenv-help
@@ -18,8 +18,7 @@ set -e
 # Provide rbenv completions
 if [ "$1" = "--complete" ]; then
   echo --usage
-  rbenv-commands
-  exit
+  exec rbenv-commands
 fi
 
 command_path() {
diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 88f9e69c..8e6ee3d8 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -5,6 +5,17 @@
 set -e
 [ -n "$RBENV_DEBUG" ] && set -x
 
+# Provide rbenv completions
+if [ "$1" = "--complete" ]; then
+  echo -
+  echo --no-rehash
+  echo bash
+  echo fish
+  echo ksh
+  echo zsh
+  exit
+fi
+
 print=""
 no_rehash=""
 for args in "$@"
diff --git a/libexec/rbenv-versions b/libexec/rbenv-versions
index a80506a8..b646cb54 100755
--- a/libexec/rbenv-versions
+++ b/libexec/rbenv-versions
@@ -9,8 +9,13 @@ set -e
 
 unset bare
 unset skip_aliases
+# Provide rbenv completions
 for arg; do
   case "$arg" in
+  --complete )
+    echo --bare
+    echo --skip-aliases
+    exit ;;
   --bare ) bare=1 ;;
   --skip-aliases ) skip_aliases=1 ;;
   * )