diff --git a/Gemfile b/Gemfile
index fd3aa03..c326c57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ platform :ruby do
 end
 
 gem 'ri_cal'
-gem 'json', '~> 1.4.6'
+gem 'yajl-ruby'
 
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 698bf26..9ee71b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.3)
-    json (1.4.6)
+    json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -219,6 +219,7 @@ GEM
     webmock (1.8.6)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -238,7 +239,6 @@ DEPENDENCIES
   hoptoad_notifier (~> 2.4)
   htmlentities (~> 4.3.0)
   inherited_resources
-  json (~> 1.4.6)
   kaminari
   lighthouse-api
   mongo (= 1.3.1)
@@ -261,3 +261,4 @@ DEPENDENCIES
   unicorn
   useragent (~> 0.3.1)
   webmock
+  yajl-ruby
--
libgit2 0.21.2