diff --git a/libexec/rbenv b/libexec/rbenv
index 0a9d0122..aab66512 100755
--- a/libexec/rbenv
+++ b/libexec/rbenv
@@ -27,6 +27,9 @@ else
 fi
 export RBENV_ROOT
 
+
+export RBENV_PLUGIN_PATH="${RBENV_PLUGIN_PATH}:/etc/rbenv.d:${RBENV_ROOT}/rbenv.d"
+
 libexec_path="$(abs_dirname "$0")"
 export PATH="${libexec_path}:${PATH}"
 
diff --git a/libexec/rbenv-plugin-scripts b/libexec/rbenv-plugin-scripts
index 27568007..af9648ed 100755
--- a/libexec/rbenv-plugin-scripts
+++ b/libexec/rbenv-plugin-scripts
@@ -17,9 +17,9 @@ if [ -z "$RBENV_COMMAND" ]; then
 fi
 
 shopt -s nullglob
-SCRIPTS=(/etc/rbenv.d/"$RBENV_COMMAND"/*.bash ${RBENV_ROOT}/rbenv.d/"$RBENV_COMMAND"/*.bash)
-shopt -u nullglob
-
-for script in ${SCRIPTS[@]}; do
-  echo $script
+for path in ${RBENV_PLUGIN_PATH//:/$'\n'}; do
+  for script in $path/"$RBENV_COMMAND"/*.bash; do
+    echo $script
+  done
 done
+shopt -u nullglob