diff --git a/Gemfile b/Gemfile
index 31c2e6cf59..63ab4ddfc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ gem 'net-ldap',                '0.11'
 
 group :production, :staging do
   gem 'unicorn',               '4.8.2'
+  gem 'unicorn-worker-killer'
   gem 'raindrops',             '0.12.0'
 end
 
diff --git a/config.ru b/config.ru
index 5f4302ebc3..346a2e0148 100644
--- a/config.ru
+++ b/config.ru
@@ -2,3 +2,5 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 run CartoDB::Application
+
+# For specifics about Unicorn worker killer config to set here, check https://github.com/kzk/unicorn-worker-killer