diff --git a/plugins/available/rvm.plugin.bash b/plugins/available/rvm.plugin.bash
index d3c81ed4..97f02146 100644
--- a/plugins/available/rvm.plugin.bash
+++ b/plugins/available/rvm.plugin.bash
@@ -1,4 +1,14 @@
 #!/bin/bash
+
+# Load RVM, if you are using it
+[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+
+# Load the auto-completion script if RVM was loaded.
+if [ "$rvm_path" ]
+then
+    [[ -r $rvm_path/scripts/completion ]] && . $rvm_path/scripts/completion
+fi
+
 switch () {
   rvm $1
   local v=$(rvm_version)