diff --git a/libexec/rbenv-which b/libexec/rbenv-which
index cf5864a6..4ba82678 100755
--- a/libexec/rbenv-which
+++ b/libexec/rbenv-which
@@ -2,6 +2,11 @@
 set -e
 [ -n "$RBENV_DEBUG" ] && set -x
 
+# Provide rbenv completions
+if [ "$1" = "--complete" ]; then
+  exec rbenv shims --short
+fi
+
 expand_path() {
   if [ ! -d "$1" ]; then
     return 1