diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
index a6c25559..d4365566 100644
--- a/plugins/available/rbenv.plugin.bash
+++ b/plugins/available/rbenv.plugin.bash
@@ -3,9 +3,7 @@
 cite about-plugin
 about-plugin 'load rbenv, if you are using it'
 
-pathmunge "${HOME}/.rbenv/bin"
+pathmunge $HOME/.rbenv/bin
+[ -x `which rbenv` ] && eval "$(rbenv init -)"
 
-[[ `which rbenv` ]] && eval "$(rbenv init -)"
-
-# Load the auto-completion script if rbenv was loaded.
-[[ -e ~/.rbenv/completions/rbenv.bash ]] && source ~/.rbenv/completions/rbenv.bash
+[ -d $HOME/.rbenv/plugins/ruby-build ] && pathmunge $HOME/.rbenv/plugins/ruby-build/bin