diff --git a/plugins/available/rbenv.bash b/plugins/available/rbenv.bash
deleted file mode 100644
index 6fd8f10c..00000000
--- a/plugins/available/rbenv.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Load rbebv, if you are using it
-export PATH="$HOME/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-
-# Check to make sure that RVM is actually loaded before adding
-# the customizations to it.
-if [ "$rvm_path" ]
-then
-    # Load the auto-completion script if rbenv was loaded.
-    source ~/.rbenv/completions/rbenv.bash
-fi
\ No newline at end of file
diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
new file mode 100644
index 00000000..bfac84d1
--- /dev/null
+++ b/plugins/available/rbenv.plugin.bash
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Load rbebv, if you are using it
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init -)"
+
+# Load the auto-completion script if rbenv was loaded.
+source ~/.rbenv/completions/rbenv.bash
\ No newline at end of file