diff --git a/Gemfile b/Gemfile
index 5848a193b..6c1a3cb57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,6 +82,7 @@ gem 'cloudfiles', '1.4.10', :require => false
 #Queue
 gem 'resque', '1.10.0'
 gem 'resque-ensure-connected'
+gem 'resque-timeout', '1.0.0'
 gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index cc7b3c7ca..14e35296e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -374,6 +374,8 @@ GEM
     resque-ensure-connected (0.1.0)
       activerecord (>= 2.3.5)
       resque (~> 1.10.0)
+    resque-timeout (1.0.0)
+      resque (~> 1.0)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rspec (2.6.0)
@@ -521,6 +523,7 @@ DEPENDENCIES
   redcarpet!
   resque (= 1.10.0)
   resque-ensure-connected
+  resque-timeout (= 1.0.0)
   rest-client (= 1.6.1)
   roxml!
   rspec (>= 2.0.0)
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb
index eddb928dc..f68fe73ec 100644
--- a/config/initializers/resque.rb
+++ b/config/initializers/resque.rb
@@ -1,5 +1,6 @@
 require 'resque'
 
+Resque::Plugins::Timeout.timeout = 120
 
 if !ENV['SINGLE_PROCESS'] && AppConfig[:redis_url]
   Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)