diff --git a/Gemfile b/Gemfile
index fc485caa..76b061d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,7 @@ group :test do
   gem 'rspec-rails', '2.3.1'
   gem 'factory_girl_rails'
   gem 'pickle'
+  gem 'xpath',            :git => 'https://github.com/wunderbread/xpath.git'
   gem 'capybara'
 
   gem 'database_cleaner'
diff --git a/Gemfile.lock b/Gemfile.lock
index d22d7a07..8d6e0ac0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,11 +4,18 @@ GIT
   specs:
     mocha (0.9.12.20110213002255)
 
+GIT
+  remote: https://github.com/wunderbread/xpath.git
+  revision: d04da707886287e7dfe82705fda5b3d4f65e94c3
+  specs:
+    xpath (0.1.2)
+      nokogiri (~> 1.4)
+
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    ZenTest (4.4.2)
+    ZenTest (4.5.0)
     abstract (1.0.0)
     actionmailer (3.0.4)
       actionpack (= 3.0.4)
@@ -45,7 +52,7 @@ GEM
     bson (1.2.2)
     bson_ext (1.2.2)
     builder (2.1.2)
-    capybara (0.4.1.2)
+    capybara (0.4.0)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -53,7 +60,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
+      xpath (~> 0.1.2)
     celerity (0.8.8)
     childprocess (0.1.7)
       ffi (~> 0.6.3)
@@ -75,7 +82,7 @@ GEM
       locomotive_carrierwave
       mongoid (~> 2.0.0.rc.6)
     daemons (1.1.0)
-    database_cleaner (0.6.3)
+    database_cleaner (0.6.4)
     delayed_job (2.1.2)
       activesupport (~> 3.0)
       daemons
@@ -88,7 +95,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    excon (0.5.4)
+    excon (0.5.6)
     factory_girl (1.3.3)
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
@@ -242,10 +249,8 @@ GEM
     warden (0.10.7)
       rack (>= 1.0.0)
     will_paginate (3.0.pre2)
-    xpath (0.1.3)
-      nokogiri (~> 1.3)
     yard (0.6.4)
-    yui-compressor (0.9.3)
+    yui-compressor (0.9.4)
 
 PLATFORMS
   ruby
@@ -291,3 +296,4 @@ DEPENDENCIES
   unicorn
   warden
   will_paginate
+  xpath!
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 6714bcad..c0714364 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta2"
 
   s.add_dependency "custom_fields", "1.0.0.beta.4"
-  s.add_dependency "fog", "0.3.7"
+  s.add_dependency "fog", "0.5.3"
   s.add_dependency "mimetype-fu"
   s.add_dependency "actionmailer-with-request"
   s.add_dependency "heroku"