diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb
new file mode 100644
index 00000000..b333ceee
--- /dev/null
+++ b/config/initializers/resque.rb
@@ -0,0 +1,8 @@
+rails_root  = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
+rails_env   = ENV['RAILS_ENV'] || 'development'
+config_file = File.join(rails_root, 'config', 'resque.yml')
+
+if File.exists?(config_file)
+  resque_config = YAML.load_file(config_file)
+  Resque.redis = resque_config[rails_env]
+end
diff --git a/config/resque.yml.example b/config/resque.yml.example
new file mode 100644
index 00000000..cd3d4874
--- /dev/null
+++ b/config/resque.yml.example
@@ -0,0 +1,3 @@
+development: localhost:6379
+test: localhost:6379
+production: redis.example.com:6379
diff --git a/doc/installation.md b/doc/installation.md
index 345d801d..865cde3c 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -251,6 +251,14 @@ You can login via web using admin generated with setup:
     # if you run this as root /home/gitlab/gitlab/tmp/pids/resque_worker.pid will be owned by root
     # causing the resque worker not to start via init script on next boot/service restart
 
+## Customizing Resque's Redis connection
+
+If you'd like Resque to connect to a Redis server on a non-standard port or on
+a different host, you can configure its connection string in the
+**config/resque.yml** file:
+
+    production: redis.example.com:6379
+
 **Ok - we have a working application now. **
 **But keep going - there are some things that should be done **
 
@@ -276,7 +284,6 @@ You can login via web using admin generated with setup:
     # of the host serving GitLab.
     sudo vim /etc/nginx/sites-enabled/gitlab
 
-
     # Restart nginx:
     /etc/init.d/nginx restart