diff --git a/Gemfile b/Gemfile
index 09129d484..8fcafc23e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'aws-s3', :require => "aws/s3"
 gem 'awesome_print'
 
 group :production do
+  gem 'unicorn'
   gem 'capistrano-unicorn', :require => false
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 846f7d38f..92351e8b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,6 +92,7 @@ GEM
     i18n (0.6.4)
     journey (1.0.4)
     json (1.7.7)
+    kgio (2.8.0)
     libv8 (3.11.8.17)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -144,6 +145,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    raindrops (0.10.0)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -191,6 +193,10 @@ GEM
     unf (0.1.1)
       unf_ext
     unf_ext (0.0.6)
+    unicorn (4.6.2)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     webrobots (0.1.1)
     whenever (0.8.2)
       activesupport (>= 2.3.4)
@@ -231,4 +237,5 @@ DEPENDENCIES
   term-ansicolor
   therubyracer
   uglifier (>= 1.0.3)
+  unicorn
   whenever
diff --git a/config/deploy.rb b/config/deploy.rb
index 956ad99f2..a20e383ad 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -139,11 +139,11 @@ after "deploy:create_symlink", "local_config:link_local_files"
 after "deploy:create_symlink", "data:link_directories"
 after "deploy:start", "delayed_job:start"
 after "deploy:stop", "delayed_job:stop"
-after "deploy:restart", "delayed_job:restart"
 before "deploy:update", "deploy:web:disable"
+after "deploy:update", "delayed_job:restart"
 after "deploy:update", "deploy:migrate"
-after "deploy:restart", "unicorn:reload"
-after "deploy:restart", "unicorn:restart"
-after "deploy:restart", "deploy:precompile_assets"
-after "deploy:restart", "deploy:web:enable"
+after "deploy:update", "unicorn:reload"
+after "deploy:update", "unicorn:restart"
+after "deploy:update", "deploy:precompile_assets"
+after "deploy:update", "deploy:web:enable"
 after "delayed_job:stop", "delayed_job:kill"