diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
index b1388017..75d24154 100644
--- a/plugins/available/rbenv.plugin.bash
+++ b/plugins/available/rbenv.plugin.bash
@@ -1,9 +1,10 @@
-# Load rbebv, if you are using it
-
 cite about-plugin
 about-plugin 'load rbenv, if you are using it'
 
-pathmunge "$HOME"/.rbenv/bin
-[ -x `which rbenv` ] && eval "$(rbenv init -)"
+export RBENV_ROOT="$HOME/.rbenv"
+pathmunge "$RBENV_ROOT/bin"
 
-[ -d "$HOME"/.rbenv/plugins/ruby-build ] && pathmunge "$HOME"/.rbenv/plugins/ruby-build/bin
+[[ `which rbenv` ]] && eval "$(rbenv init -)"
+
+# Load the auto-completion script if rbenv was loaded.
+[[ -e $RBENV_ROOT/completions/rbenv.bash ]] && source $RBENV_ROOT/completions/rbenv.bash