diff --git a/libexec/rbenv-rehash b/libexec/rbenv-rehash
index c0096616..96305478 100755
--- a/libexec/rbenv-rehash
+++ b/libexec/rbenv-rehash
@@ -1,14 +1,28 @@
 #!/usr/bin/env bash -e
 
+make_shims() {
+  local glob="$@"
+
+  for file in $glob; do
+    local shim="${file##*/}"
+    cat > "$shim" <<SH
+#!/bin/sh
+exec rbenv exec $shim "\$@"
+SH
+    chmod +x "$shim"
+  done
+}
+
 mkdir -p "${HOME}/.rbenv/shims"
 cd "${HOME}/.rbenv/shims"
 rm -f *
 
-for file in ../versions/*/bin/*; do
-  shim="${file##*/}"
-  cat > "$shim" <<SH
-#!/bin/sh
-exec rbenv exec $shim "\$@"
-SH
-  chmod +x "$shim"
+make_shims ../versions/*/bin/*
+
+shopt -s nullglob
+RBENV_REHASH_PLUGINS=(/etc/rbenv.d/rehash/*.bash ${HOME}/.rbenv/rbenv.d/rehash/*.bash)
+shopt -u nullglob
+
+for script in $RBENV_REHASH_PLUGINS; do
+  source $script
 done
diff --git a/libexec/rbenv-which b/libexec/rbenv-which
index 7f308e2d..34ea534e 100755
--- a/libexec/rbenv-which
+++ b/libexec/rbenv-which
@@ -4,6 +4,14 @@ RBENV_VERSION="$(rbenv-version)"
 RBENV_COMMAND="$1"
 RBENV_COMMAND_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}/bin/${RBENV_COMMAND}"
 
+shopt -s nullglob
+RBENV_WHICH_PLUGINS=(/etc/rbenv.d/which/*.bash ${HOME}/.rbenv/rbenv.d/which/*.bash)
+shopt -u nullglob
+
+for script in $RBENV_WHICH_PLUGINS; do
+  source $script
+done
+
 if [ -x "$RBENV_COMMAND_PATH" ]; then
   echo "$RBENV_COMMAND_PATH"
 else