diff --git a/Gemfile b/Gemfile
index 23a2c75..5daa5fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ source :gemcutter
 
 gem "rails", "~> 2.3.5"
 gem "rack", "~> 1.0.0"
-gem "json", "~> 1.6.3"
+gem "json", "~> 2.3.0"
 gem "dalli",  "~> 1.0.4"
 gem "bj"
 gem "sqlite3-ruby"
diff --git a/Gemfile.lock b/Gemfile.lock
index 60cf375..d3474a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
       yamler (>= 0.1.0)
     dalli (1.0.5)
     i18n (0.6.0)
-    json (1.6.7)
+    json (2.3.0)
     jwt (0.1.4)
       json (>= 1.2.4)
     mail (2.4.4)
@@ -54,7 +54,6 @@ GEM
     rake (0.9.2.2)
     sendgrid (1.0.1)
       json
-      json
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -83,7 +82,7 @@ DEPENDENCIES
   bj
   chronic (~> 0.3.0)
   dalli (~> 1.0.4)
-  json (~> 1.6.3)
+  json (~> 2.3.0)
   parallel
   pony
   rack (~> 1.0.0)