diff --git a/completions/_rbenv.zsh b/completions/rbenv.zsh
similarity index 100%
rename from completions/_rbenv.zsh
rename to completions/rbenv.zsh
diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 4dc751dd..392edf40 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -55,8 +55,10 @@ mkdir -p "${HOME}/.rbenv/"{shims,versions}
 
 echo 'export PATH="${HOME}/.rbenv/shims:${PATH}"'
 
-if [ "$shell" = "bash" ]; then
-  echo "source \"$root/completions/rbenv.bash\""
-fi
+case "$shell" in
+bash | zsh )
+  echo "source \"$root/completions/rbenv.${shell}\""
+  ;;
+esac
 
 echo 'rbenv rehash 2>/dev/null'