diff --git a/libexec/rbenv b/libexec/rbenv
index 5d087860..2c00d7d7 100755
--- a/libexec/rbenv
+++ b/libexec/rbenv
@@ -28,17 +28,21 @@ fi
 export RBENV_ROOT
 
 
-export RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d"
-
-
 shopt -s nullglob
-rbenv_path="$(abs_dirname "$0")"
-for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do
-  rbenv_path="${rbenv_path}:${plugin_bin}"
-done
-shopt -u nullglob
 
-export PATH="${rbenv_path}:${PATH}"
+bin_path="$(abs_dirname "$0")"
+for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do
+  bin_path="${bin_path}:${plugin_bin}"
+done
+export PATH="${bin_path}:${PATH}"
+
+hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d"
+for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
+  hook_path="${hook_path}:${plugin_hook}"
+done
+export RBENV_HOOK_PATH="$hook_path"
+
+shopt -u nullglob
 
 
 command="$1"