diff --git a/libexec/nodenv-init b/libexec/nodenv-init
index 19dfcc2..fb54efb 100755
--- a/libexec/nodenv-init
+++ b/libexec/nodenv-init
@@ -99,3 +99,52 @@ is_fish && {
   echo 'export PATH="'${NODENV_ROOT}'/shims:${PATH}"'
   echo 'nodenv rehash 2>/dev/null'
 }
+
+commands=(`nodenv-commands --sh`)
+case "$shell" in
+fish )
+  cat <<EOS
+function nodenv
+  set command \$argv[1]
+  set -e argv[1]
+
+  switch "\$command"
+  case ${commands[*]}
+    eval (nodenv "sh-\$command" \$argv)
+  case '*'
+    command nodenv "\$command" \$argv
+  end
+end
+EOS
+  ;;
+ksh )
+  cat <<EOS
+function nodenv {
+  typeset command
+EOS
+  ;;
+* )
+  cat <<EOS
+nodenv() {
+  local command
+EOS
+  ;;
+esac
+
+if [ "$shell" != "fish" ]; then
+IFS="|"
+cat <<EOS
+  command="\$1"
+  if [ "\$#" -gt 0 ]; then
+    shift
+  fi
+
+  case "\$command" in
+  ${commands[*]})
+    eval "\`nodenv "sh-\$command" "\$@"\`";;
+  *)
+    command nodenv "\$command" "\$@";;
+  esac
+}
+EOS
+fi
diff --git a/libexec/nodenv-sh-rehash b/libexec/nodenv-sh-rehash
new file mode 100755
index 0000000..dd35d29
--- /dev/null
+++ b/libexec/nodenv-sh-rehash
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -e
+[ -n "$NODENV_DEBUG" ] && set -x
+
+# Provide nodenv completions
+if [ "$1" = "--complete" ]; then
+  exec nodenv-rehash --complete
+fi
+
+shell="$(basename "${NODENV_SHELL:-$SHELL}")"
+
+# When nodenv shell integration is enabled, delegate to nodenv-rehash,
+# then tell the shell to empty its command lookup cache.
+nodenv-rehash
+
+case "$shell" in
+fish )
+  # no rehash support
+  ;;
+* )
+  echo "hash -r 2>/dev/null || true"
+  ;;
+esac
diff --git a/libexec/nodenv-shell b/libexec/nodenv-sh-shell
similarity index 100%
rename from libexec/nodenv-shell
rename to libexec/nodenv-sh-shell