diff --git a/Gemfile b/Gemfile
index 67682bc5a942..ed68d57703fe 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.13.6'
 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 4beb3e8890b4..1eaac0c5c57b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.6.2)
+    mini_portile2 (2.8.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
@@ -180,8 +180,9 @@ GEM
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-ldap (0.11)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     oauth (0.4.5)
     oauth-plugin (0.4.0.pre4)
       oauth (>= 0.4.4)
@@ -193,6 +194,7 @@ GEM
       http_parser.rb (~> 0.5.3)
       multi_json (~> 1.0)
     polyglot (0.3.5)
+    racc (1.6.0)
     rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -361,7 +363,7 @@ DEPENDENCIES
   instagram (= 1.1.3)
   mocha (= 1.1.0)
   net-ldap (= 0.11)
-  nokogiri (~> 1.6.6.2)
+  nokogiri (~> 1.13.6)
   oauth (= 0.4.5)
   oauth-plugin (= 0.4.0.pre4)
   pg (= 0.13.2)