diff --git a/.gitignore b/.gitignore
index 7cedbc51d..5fa4f1592 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ config/deploy_config.yml
 .bundle
 vendor/bundle/*
 config/database.yml
+.rvmrc_custom
 
 # Generated files
 log/*
diff --git a/.rvmrc b/.rvmrc
index 956bdbf3e..2ab45d03d 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1 +1,6 @@
-rvm ree-1.8.7-2011.03
+#!/bin/bash
+if [ -e '.rvmrc_custom' ]; then
+  source .rvmrc_custom;
+else
+  rvm --create use ree@diaspora;
+fi