diff --git a/Gemfile b/Gemfile
index 719cab69..52376bd1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,8 @@ gem 'bcrypt-ruby', '~> 2.1.4'
 gem 'htmlentities', '~> 4.3.0'
 gem "mail"
 
+gem "json", ">= 1.7.7"
+
 if RUBY_VERSION.to_f >= 1.9
 	gem "soap4r-ruby1.9"
 else
diff --git a/Gemfile.lock b/Gemfile.lock
index 37d5834d..fabe80e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
     htmlentities (4.3.1)
     httpclient (2.3.0.1)
     i18n (0.6.1)
-    json (1.7.5)
+    json (1.7.7)
     libwebsocket (0.1.7.1)
       addressable
       websocket