diff --git a/Gemfile b/Gemfile
index 223621709..e167ec765 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'devise', '2.1.3'
 
 # Background processing
 
-gem 'sidekiq', '2.7.5'
+gem 'sidekiq', '2.9.0'
 gem 'sinatra', '1.3.3'
 gem 'slim', '1.3.6'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 05725f58c..c854900c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
     excon (0.20.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    facter (1.6.17)
+    facter (1.6.18)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.2.1)
@@ -219,7 +219,7 @@ GEM
     mobile-fu (1.1.1)
       rack-mobile-detect
       rails
-    multi_json (1.7.1)
+    multi_json (1.7.2)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
     nested_form (0.3.1)
@@ -360,7 +360,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    sidekiq (2.7.5)
+    sidekiq (2.9.0)
       celluloid (~> 0.12.0)
       connection_pool (~> 1.0)
       multi_json (~> 1)
@@ -485,7 +485,7 @@ DEPENDENCIES
   ruby-oembed (= 0.8.8)
   sass-rails (= 3.2.6)
   selenium-webdriver (= 2.31.0)
-  sidekiq (= 2.7.5)
+  sidekiq (= 2.9.0)
   sinatra (= 1.3.3)
   slim (= 1.3.6)
   spork (= 1.0.0rc3)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 01f82dbd8..65c6bdec4 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,4 +1,5 @@
 require 'sidekiq_middlewares'
+require 'sidekiq/middleware/i18n'
 
 # Single process-mode
 if AppConfig.environment.single_process_mode? && Rails.env != "test"
diff --git a/config/unicorn.rb b/config/unicorn.rb
index 281469169..0257093e2 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -1,5 +1,3 @@
-rails_env = ENV['RAILS_ENV'] || 'development'
-
 require 'pathname'
 require Pathname.new(__FILE__).expand_path.dirname.join('load_config')
 
@@ -20,13 +18,9 @@ timeout 30
 #pid '/var/run/diaspora/diaspora.pid'
 #listen '/var/run/diaspora/diaspora.sock', :backlog => 2048
 
-if AppConfig.server.stderr_log.present?
-  stderr_path AppConfig.server.stderr_log.get
-end
 
-if AppConfig.server.stdout_log.present?
-  stdout_path AppConfig.server.stdout_log.get
-end
+stderr_path AppConfig.server.stderr_log.get if AppConfig.server.stderr_log.present?
+stdout_path AppConfig.server.stdout_log.get if AppConfig.server.stdout_log.present?
 
 before_fork do |server, worker|
   # If using preload_app, enable this line
@@ -55,11 +49,4 @@ end
 after_fork do |server, worker|
   # If using preload_app, enable this line
   ActiveRecord::Base.establish_connection
-
-  unless AppConfig.environment.single_process_mode?
-    Sidekiq.redis = AppConfig.get_redis_options
-  end
-
-  # Enable this line to have the workers run as different user/group
-  #worker.user(user, group)
 end