diff --git a/libexec/rbenv-commands b/libexec/rbenv-commands
index 43846ce4..08c5a944 100755
--- a/libexec/rbenv-commands
+++ b/libexec/rbenv-commands
@@ -1,11 +1,25 @@
 #!/usr/bin/env bash
 set -e
 
+if [ "$1" = "--sh" ]; then
+  sh=1
+  shift
+fi
+
 shopt -s nullglob
 
 { for path in ${PATH//:/$'\n'}; do
     for command in "${path}/rbenv-"*; do
-      echo "${command##*rbenv-}"
+      command="${command##*rbenv-}"
+      if [ -n "$sh" ]; then
+        if [ ${command:0:3} = "sh-" ]; then
+          echo ${command##sh-}
+        fi
+      else
+        if [ ${command:0:3} != "sh-" ]; then
+          echo $command
+        fi
+      fi
     done
   done
 } | sort | uniq
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
diff --git a/libexec/rbenv-sh-use b/libexec/rbenv-sh-use
new file mode 100755
index 00000000..187ed6ac
--- /dev/null
+++ b/libexec/rbenv-sh-use
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "export RBENV_VERSION=$1"