diff --git a/gemfiles/Gemfile.rails-3.1.x b/gemfiles/Gemfile.rails-3.1.x
index b881657f..d9d78208 100644
--- a/gemfiles/Gemfile.rails-3.1.x
+++ b/gemfiles/Gemfile.rails-3.1.x
@@ -28,8 +28,6 @@ platforms :ruby do
   gem "sqlite3"
 
   group :mongoid do
-    gem "mongo", "~> 1.3.0"
-    gem "mongoid", "~> 2.0"
-    gem "bson_ext", "~> 1.3.0"
+    gem "mongoid", "~> 3.0"
   end
 end
diff --git a/gemfiles/Gemfile.rails-3.1.x.lock b/gemfiles/Gemfile.rails-3.1.x.lock
index 1dd424e0..ddb22af6 100644
--- a/gemfiles/Gemfile.rails-3.1.x.lock
+++ b/gemfiles/Gemfile.rails-3.1.x.lock
@@ -1,11 +1,11 @@
 PATH
   remote: ..
   specs:
-    devise (2.1.0.rc2)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.7)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.2.1)
 
 GEM
   remote: http://rubygems.org/
@@ -41,8 +41,6 @@ GEM
     addressable (2.2.7)
     arel (2.2.3)
     bcrypt-ruby (3.0.1)
-    bson (1.5.2)
-    bson_ext (1.3.1)
     builder (3.0.0)
     columnize (0.3.6)
     erubis (2.7.0)
@@ -64,12 +62,12 @@ GEM
     mime-types (1.18)
     mocha (0.10.4)
       metaclass (~> 0.0.1)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.4.4)
+    mongoid (3.0.12)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
+    moped (1.2.9)
     multi_json (1.3.4)
     multipart-post (1.1.5)
     nokogiri (1.5.0)
@@ -87,7 +85,8 @@ GEM
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    orm_adapter (0.0.7)
+    origin (1.0.10)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.2)
@@ -137,7 +136,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    warden (1.1.1)
+    warden (1.2.1)
       rack (>= 1.0)
     webrat (0.7.2)
       nokogiri (>= 1.2.0)
@@ -150,12 +149,10 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
-  bson_ext (~> 1.3.0)
   devise!
   jruby-openssl
   mocha
-  mongo (~> 1.3.0)
-  mongoid (~> 2.0)
+  mongoid (~> 3.0)
   omniauth (~> 1.0.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.0.0)