diff --git a/completions/rbenv.bash b/completions/rbenv.bash
index 3ad2aa21..493a6a7d 100644
--- a/completions/rbenv.bash
+++ b/completions/rbenv.bash
@@ -17,7 +17,7 @@ _rbenv() {
   local prev="${COMP_WORDS[COMP_CWORD-1]}"
 
   case "$prev" in
-  default | local | prefix )
+  set-* | default | local | prefix )
     _rbenv_versions
     ;;
   * )
diff --git a/completions/rbenv.zsh b/completions/rbenv.zsh
index da51e405..efaebe4e 100644
--- a/completions/rbenv.zsh
+++ b/completions/rbenv.zsh
@@ -14,7 +14,7 @@ _rbenv_versions() {
 
 _rbenv() {
   case "$words[2]" in
-    set-local | set-default | prefix ) _rbenv_versions ;;
+    set-* | default | local | prefix ) _rbenv_versions ;;
     * ) _rbenv_commands ;;
   esac
 }