diff --git a/Gemfile b/Gemfile
index 0a710046..e696fec4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "paperclip", '2.3.8'
 gem "hoptoad_notifier", '2.3.12'
 gem "taps", "~> 0.3.22"
 gem "aws-s3", '0.6.2'
-gem "nokogiri", '1.5.0'
+gem "nokogiri", '1.18.4'
 
 group :development, :test, :cucumber do
   gem "heroku"
diff --git a/Gemfile.lock b/Gemfile.lock
index bd9179d9..ea4f7593 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,6 +85,7 @@ GEM
       rbx-require-relative (> 0.0.4)
     method_info (0.1.11)
     mime-types (1.16)
+    mini_portile2 (2.8.8)
     mocha (0.9.8)
       rake
     mongrel (1.1.5)
@@ -95,8 +96,9 @@ GEM
     mongrel (1.1.5-x86-mingw32)
       cgi_multipart_eof_fix (>= 2.4)
       gem_plugin (>= 0.2.3)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-x86-mingw32)
+    nokogiri (1.18.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     paperclip (2.3.8)
       activerecord
       activesupport
@@ -104,6 +106,7 @@ GEM
     pg (0.11.0-x86-mingw32)
     pickle (0.2.10)
     polyglot (0.3.1)
+    racc (1.8.1)
     rack (1.1.2)
     rack-test (0.6.0)
       rack (>= 1.0)
@@ -144,7 +147,7 @@ GEM
     string_to_editor (0.0.2)
     taps (0.3.23)
       rack (>= 1.0.1)
-      rest-client (< 1.7.0, >= 1.4.0)
+      rest-client (>= 1.4.0, < 1.7.0)
       sequel (~> 3.20.0)
       sinatra (~> 1.0.0)
       sqlite3-ruby (~> 1.2)
@@ -188,7 +191,7 @@ DEPENDENCIES
   method_info (= 0.1.11)
   mocha (= 0.9.8)
   mongrel (= 1.1.5)
-  nokogiri (= 1.5.0)
+  nokogiri (= 1.18.4)
   paperclip (= 2.3.8)
   pg
   pickle (= 0.2.10)