diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..d74da188
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "xpath"]
+	path = xpath
+	url = git://github.com/jnicklas/xpath.git
diff --git a/Gemfile b/Gemfile
index 846764e0..07a1f43e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source :rubygems
 
 gem 'bundler', '~> 1.0'
-gem 'xpath', :path => '../xpath' if ENV['XPATH_LOCAL']
 gemspec
+
+@dependencies.delete_if {|d| d.name == "xpath" }
+gem 'xpath', :path => 'xpath'
diff --git a/Gemfile.lock b/Gemfile.lock
index b31bca23..30dad79c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,6 +11,12 @@ PATH
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.2)
 
+PATH
+  remote: xpath
+  specs:
+    xpath (0.1.2)
+      nokogiri (~> 1.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -58,8 +64,6 @@ GEM
     sinatra (1.0)
       rack (>= 1.0)
     weakling (0.0.4-java)
-    xpath (0.1.2)
-      nokogiri (~> 1.3)
     yard (0.6.1)
 
 PLATFORMS
@@ -80,5 +84,5 @@ DEPENDENCIES
   rspec (>= 2.0.0)
   selenium-webdriver (>= 0.0.27)
   sinatra (>= 0.9.4)
-  xpath (~> 0.1.2)
+  xpath!
   yard (>= 0.5.8)
diff --git a/capybara.gemspec b/capybara.gemspec
index f4d125be..9ad1223a 100644
--- a/capybara.gemspec
+++ b/capybara.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("selenium-webdriver", [">= 0.0.27"])
   s.add_runtime_dependency("rack", [">= 1.0.0"])
   s.add_runtime_dependency("rack-test", [">= 0.5.4"])
-  s.add_runtime_dependency("xpath", ["~> 0.1.2"]) unless ENV['XPATH_LOCAL']
+  s.add_runtime_dependency("xpath", ["~> 0.1.2"])
 
   s.add_development_dependency("sinatra", [">= 0.9.4"])
   s.add_development_dependency("rspec", [">= 2.0.0"])
diff --git a/xpath b/xpath
new file mode 160000
index 00000000..94c46fb3
--- /dev/null
+++ b/xpath
@@ -0,0 +1 @@
+Subproject commit 94c46fb3a2b3f7761e4f7c379a469986cb1a6bc9