diff --git a/Gemfile b/Gemfile
index 64c527c19237..91d11a318a68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'oauth-plugin',            '0.4.0.pre4'
 
 gem 'redis',                   '3.2.1'
 gem 'hiredis',                 '0.6.0'
-gem 'nokogiri',                '~> 1.6.6.2'
+gem 'nokogiri',                '~> 1.15.4'
 gem 'statsd-client',           '0.0.7', require: 'statsd'
 gem 'aws-sdk',                 '1.8.5'
 gem 'ruby-prof',               '0.15.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index d02a6592c158..24870eec70ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,6 +96,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.2.2)
     daemons (1.2.3)
     db-query-matchers (0.4.0)
     dbf (2.0.6)
@@ -155,7 +156,8 @@ GEM
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     instagram (1.1.6)
       faraday (>= 0.7, < 0.10)
@@ -163,7 +165,7 @@ GEM
       hashie (>= 0.4.0)
       multi_json (~> 1.0, >= 1.0.3)
     journey (1.0.4)
-    json (1.8.3)
+    json (1.8.6)
     jwt (1.5.4)
     kgio (2.10.0)
     launchy (2.4.3)
@@ -176,18 +178,19 @@ GEM
     memory_profiler (0.9.6)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.6.2)
+    mini_portile2 (2.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mock_redis (0.16.0)
     mono_logger (1.1.0)
     msgpack (0.7.4)
-    multi_json (1.11.2)
+    multi_json (1.15.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-ldap (0.11)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     oauth (0.4.5)
     oauth-plugin (0.4.0.pre4)
       oauth (>= 0.4.4)
@@ -200,8 +203,9 @@ GEM
       multi_json (~> 1.0)
     polyglot (0.3.5)
     power_assert (0.2.7)
+    racc (1.7.1)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.14.0)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
@@ -320,7 +324,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
-    thor (0.19.1)
+    thor (1.2.2)
     thread_safe (0.3.5)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -390,7 +394,7 @@ DEPENDENCIES
   mocha (= 1.1.0)
   mock_redis
   net-ldap (= 0.11)
-  nokogiri (~> 1.6.6.2)
+  nokogiri (~> 1.15.4)
   oauth (= 0.4.5)
   oauth-plugin (= 0.4.0.pre4)
   pg (= 0.15.0)