diff --git a/Gemfile b/Gemfile
index d1eb8d08f..3a3bc76de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.2.0"
 # API and JSON
 
 gem "acts_as_api", "1.0.0"
-gem "json",        "1.8.6"
+gem "json",        "2.1.0"
 gem "json-schema", "2.8.0"
 
 # Authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index ddc7ffddd..07c7ae61f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,7 +327,7 @@ GEM
       sprockets-rails
     js_image_paths (0.1.0)
       rails (~> 4.0)
-    json (1.8.6)
+    json (2.1.0)
     json-jwt (1.7.1)
       activesupport
       bindata
@@ -806,7 +806,7 @@ DEPENDENCIES
   jquery-ui-rails (= 5.0.5)
   js-routes (= 1.3.3)
   js_image_paths (= 0.1.0)
-  json (= 1.8.6)
+  json (= 2.1.0)
   json-schema (= 2.8.0)
   leaflet-rails (= 0.7.7)
   logging-rails (= 0.5.0)