diff --git a/completion-bundle b/completion-bundle
index 81c572a..03b8299 100644
--- a/completion-bundle
+++ b/completion-bundle
@@ -250,5 +250,5 @@ __bundle_exec_ruby() {
 }
 
 
-complete -F __bundle -o bashdefault -o default bundle bundler
+complete -F __bundle -o bashdefault -o default bundle bundle2.{0..7} bundle3.{0..3} bundler bundler2.{0..7} bundler3.{0..3}
 # vim: ai ft=sh sw=4 sts=4 et
diff --git a/completion-gem b/completion-gem
index 09c2928..e8dd330 100644
--- a/completion-gem
+++ b/completion-gem
@@ -137,5 +137,5 @@ __gem_command_options() {
             end' 2>/dev/null
 }
 
-complete -F __gem -o bashdefault -o default gem gem1.{8..9} gem2.{0..7} jgem
+complete -F __gem -o bashdefault -o default gem gem1.{8..9} gem2.{0..7} gem3.{0..3} jgem
 # vim: ai ft=sh sw=4 sts=4 et
diff --git a/completion-rake b/completion-rake
index 5f92ffe..ebda858 100644
--- a/completion-rake
+++ b/completion-rake
@@ -180,5 +180,5 @@ __rake_tasks() {
     fi
 }
 
-complete -F __rake -o bashdefault -o default rake rake1.8 rake1.9
+complete -F __rake -o bashdefault -o default rake rake1.{8..9} rake2.{0..7} rake3.{0..3}
 # vim: ai ft=sh sw=4 sts=4 et
diff --git a/completion-ruby b/completion-ruby
index bc44a85..0984904 100644
--- a/completion-ruby
+++ b/completion-ruby
@@ -73,5 +73,5 @@ __ruby() {
     fi
 }
 
-complete -F __ruby -o filenames -o bashdefault -o default ruby ruby1.{8..9} ruby2.{0..7}
+complete -F __ruby -o filenames -o bashdefault -o default ruby ruby1.{8..9} ruby2.{0..7} ruby3.{0..3}
 # vim: ai ft=sh sw=4 sts=4 et
diff --git a/completion-ruby-all b/completion-ruby-all
index 42d3200..a6e1609 100644
--- a/completion-ruby-all
+++ b/completion-ruby-all
@@ -96,12 +96,12 @@ else
         }
     fi
 
-    _cr_load gem gem1.{8..9} gem2.{0..7} jgem
+    _cr_load gem gem1.{8..9} gem2.{0..7} gem3.{0..3} jgem
     _cr_load jruby
     _cr_load rails
-    _cr_load bundle bundler
-    _cr_load rake
-    _cr_load ruby ruby1.{8..9} ruby2.{0..7}
+    _cr_load bundle bundle2.{0..7} bundle3.{0..3} bundler bundler2.{0..7} bundler3.{0..3}
+    _cr_load rake rake1.{8..9} rake2.{0..7} rake3.{0..3}
+    _cr_load ruby ruby1.{8..9} ruby2.{0..7} ruby3.{0..3}
 
     unset -f _cr_load _cr_anycmd
     unset -v _CR_PATH