diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 3e670372..29daa10c 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -66,3 +66,18 @@ bash | zsh )
 esac
 
 echo 'rbenv rehash 2>/dev/null'
+
+commands=(`rbenv commands --sh`)
+IFS="|"
+cat <<EOS
+function rbenv () {
+  command=\$1;
+  shift;
+  case \$command in
+  ${commands[*]})
+    eval \`rbenv sh-\$command \$@\`;;
+  *)
+    command rbenv \$command \$@;;
+  esac;
+};
+EOS