diff --git a/plugins/rbenv/README.md b/plugins/rbenv/README.md
index 43a2e93ac..720730337 100644
--- a/plugins/rbenv/README.md
+++ b/plugins/rbenv/README.md
@@ -3,6 +3,8 @@
 The primary job of this plugin is to provide `rbenv_prompt_info` which can be added to your theme to include Ruby
 version and gemset information into your prompt.
 
+Additionally, this plugin provides completion for the `rbenv` command. See also <https://github.com/rbenv/rbenv/#shell-completions>.
+
 Some functionality of this plugin will not work unless you also have the rbenv plugin *gemset* installed.
 https://github.com/jf/rbenv-gemset
 
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d758aebae..4f8b022af 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -2,6 +2,7 @@
 # the 'rbenv_prompt_info' function.
 
 FOUND_RBENV=$+commands[rbenv]
+RBENV_ROOT=''
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
   rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
@@ -9,6 +10,7 @@ if [[ $FOUND_RBENV -ne 1 ]]; then
     if [[ -d $dir/bin ]]; then
       export PATH="$dir/bin:$PATH"
       FOUND_RBENV=1
+      RBENV_ROOT="$dir"
       break
     fi
   done
@@ -24,6 +26,10 @@ if [[ $FOUND_RBENV -ne 1 ]]; then
 fi
 
 if [[ $FOUND_RBENV -eq 1 ]]; then
+  if [[ -d "$RBENV_ROOT/completions" ]]; then
+    fpath+=("$RBENV_ROOT/completions")
+  fi
+
   eval "$(rbenv init --no-rehash - zsh)"
 
   alias rubies="rbenv versions"