diff --git a/Gemfile b/Gemfile
index fd62809ba..149384d30 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,7 @@ gem 'messagebus_ruby_api', '1.0.3'
 
 # Parsing
 
-gem 'nokogiri',       '1.5.9'
+gem 'nokogiri',       '1.6.0'
 gem 'rails_autolink', '1.1.0'
 gem 'redcarpet',      '2.3.0'
 gem 'roxml',          '3.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6644b86f9..3342704ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,6 +212,7 @@ GEM
     mime-types (1.23)
     mini_magick (3.6.0)
       subexec (~> 0.2.1)
+    mini_portile (0.5.1)
     mobile-fu (1.2.1)
       rack-mobile-detect
       rails
@@ -223,7 +224,8 @@ GEM
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
-    nokogiri (1.5.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -453,7 +455,7 @@ DEPENDENCIES
   mini_magick (= 3.6.0)
   mobile-fu (= 1.2.1)
   mysql2 (= 0.3.11)
-  nokogiri (= 1.5.9)
+  nokogiri (= 1.6.0)
   omniauth (= 1.1.4)
   omniauth-facebook (= 1.4.1)
   omniauth-tumblr (= 1.1)