diff --git a/.gitignore b/.gitignore
index 755c9eb4e..f3b4d13bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ vendor/bundle/*
 vendor/cache/*
 config/database.yml
 .rvmrc_custom
+.rvmrc.local
 
 #Mailing list stuff
 config/email_offset
diff --git a/.rvmrc b/.rvmrc
index 8a66ca860..7e7da08d4 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1,5 +1,7 @@
 #!/bin/bash
-if [ -e '.rvmrc_custom' ]; then
+if [ -e '.rvmrc.local' ]; then
+  source .rvmrc.local;
+elif [ -e '.rvmrc_custom' ] ; then
   source .rvmrc_custom;
 else
   rvm --create use ruby-1.9.2-p290@diaspora