diff --git a/Gemfile b/Gemfile
index 658fb76c1..d4192afa2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem "responders", "2.4.0"
 
 # Appserver
 
-gem "unicorn", "5.3.0", require: false
+gem "unicorn", "5.4.0", require: false
 gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
diff --git a/Gemfile.lock b/Gemfile.lock
index 7dee030be..841cd52c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -347,7 +347,7 @@ GEM
     jsonpath (0.8.7)
       multi_json
     jwt (1.5.6)
-    kgio (2.11.0)
+    kgio (2.11.2)
     leaflet-rails (1.2.0)
       rails (>= 4.2.0)
     listen (3.1.5)
@@ -722,7 +722,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
-    unicorn (5.3.0)
+    unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.4)
@@ -899,7 +899,7 @@ DEPENDENCIES
   twitter-text (= 1.14.7)
   typhoeus (= 1.3.0)
   uglifier (= 3.2.0)
-  unicorn (= 5.3.0)
+  unicorn (= 5.4.0)
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.8)
   versionist (= 1.6.0)