diff --git a/Gemfile.lock b/Gemfile.lock
index 56cfe354..d90d46b5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,22 +1,21 @@
 PATH
   remote: .
   specs:
-    locomotive_cms (2.0.0.rc8)
+    locomotive_cms (2.0.0.rc7)
       RedCloth (~> 4.2.8)
       actionmailer-with-request (~> 0.3.0)
       bson_ext (~> 1.5.2)
       cancan (~> 1.6.7)
-      carrierwave (~> 0.6.0)
-      carrierwave-mongoid (~> 0.1.3)
+      carrierwave-mongoid (~> 0.2.1)
       cells (~> 3.8.0)
       codemirror-rails (~> 2.21)
-      custom_fields (~> 2.0.0.rc11)
+      custom_fields (~> 2.0.0.rc12)
       devise (~> 1.5.3)
       dragonfly (~> 0.9.8)
       flash_cookie_session (~> 1.1.1)
       fog (~> 1.3.1)
       formtastic (~> 2.0.2)
-      haml (~> 3.1.4)
+      haml (~> 3.1.6)
       highline (~> 1.6.2)
       httparty (~> 0.8.1)
       jquery-rails (~> 1.0.19)
@@ -89,8 +88,8 @@ GEM
     carrierwave (0.6.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    carrierwave-mongoid (0.1.3)
-      carrierwave (>= 0.5.6)
+    carrierwave-mongoid (0.2.1)
+      carrierwave (~> 0.6.1)
       mongoid (~> 2.1)
     cells (3.8.5)
       actionpack (~> 3.0)
@@ -122,9 +121,9 @@ GEM
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    custom_fields (2.0.0.rc11)
+    custom_fields (2.0.0.rc12)
       activesupport (~> 3.2.1)
-      carrierwave-mongoid (~> 0.1.3)
+      carrierwave-mongoid (~> 0.2.1)
       mongoid (~> 2.4.9)
     database_cleaner (0.8.0)
     devise (1.5.3)
@@ -207,9 +206,9 @@ GEM
     mocha (0.9.12)
     mongo (1.5.2)
       bson (= 1.5.2)
-    mongoid (2.4.10)
+    mongoid (2.4.11)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
     multi_json (1.3.6)
     multi_xml (0.5.1)
@@ -286,7 +285,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.22.1)
+    selenium-webdriver (2.22.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 8c138adb..bcd745f4 100755
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'mongoid',                         '~> 2.4.9'
   s.add_dependency 'locomotive-mongoid-tree',         '~> 0.6.2'
 
-  s.add_dependency 'custom_fields',                   '~> 2.0.0.rc11'
+  s.add_dependency 'custom_fields',                   '~> 2.0.0.rc12'
 
   s.add_dependency 'kaminari',                        '~> 0.13.0'
 
-  s.add_dependency 'haml',                            '~> 3.1.4'
+  s.add_dependency 'haml',                            '~> 3.1.6'
   s.add_dependency 'jquery-rails',                    '~> 1.0.19'
   s.add_dependency 'rails-backbone',                  '~> 0.6.1'
   s.add_dependency 'codemirror-rails',                '~> 2.21'
@@ -52,8 +52,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'unidecoder',                      '~> 1.1.1'
 
   s.add_dependency 'rmagick',                         '~> 2.12.2'
-  s.add_dependency 'carrierwave-mongoid',             '~> 0.1.3'
-  s.add_dependency 'carrierwave',                     '~> 0.6.0'
+  s.add_dependency 'carrierwave-mongoid',             '~> 0.2.1'
+  # s.add_dependency 'carrierwave',                     '~> 0.6.2'
   s.add_dependency 'fog',                             '~> 1.3.1'
   s.add_dependency 'dragonfly',                       '~> 0.9.8'
   s.add_dependency 'rack-cache',                      '~> 1.1'