diff --git a/Gemfile b/Gemfile
index c2660fe9..3b824fc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'bundler', '~> 1.1'
 gemspec
 
-gem 'xpath', :git => 'git://github.com/jnicklas/xpath.git'
+gem 'xpath', :git => 'git://github.com/teamcapybara/xpath.git'
 
 group :doc do
   gem 'redcarpet', :platforms => :mri
diff --git a/gemfiles/Gemfile.base-versions b/gemfiles/Gemfile.base-versions
index a87dded8..4e344158 100644
--- a/gemfiles/Gemfile.base-versions
+++ b/gemfiles/Gemfile.base-versions
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem 'bundler', '~> 1.0'
 gemspec :path => '..'
 
-gem 'xpath', :git => 'git://github.com/jnicklas/xpath.git'
+gem 'xpath', :git => 'git://github.com/teamcapybara/xpath.git'
 
 gem 'rack', '= 1.3.0' # cannot go lower because referer tests need aa7ce77cd0
 gem 'rack-test', '= 0.5.4'
diff --git a/gemfiles/Gemfile.beta-versions b/gemfiles/Gemfile.beta-versions
index cd0e38f8..09ff70fa 100644
--- a/gemfiles/Gemfile.beta-versions
+++ b/gemfiles/Gemfile.beta-versions
@@ -4,7 +4,7 @@ gem 'bundler', '~> 1.1'
 gemspec :path => '..'
 
 gem 'pkg-config' # needed by nokogiri
-gem 'xpath', github: 'jnicklas/xpath'
+gem 'xpath', github: 'teamcapybara/xpath'
 gem 'rack', github: 'rack/rack'
 gem 'sinatra', github: 'sinatra/sinatra', branch: 'master'
 gem 'rspec', github: 'rspec/rspec'
diff --git a/gemfiles/Gemfile.edge-marionette b/gemfiles/Gemfile.edge-marionette
index 4ae13ed8..d5a7e0b8 100644
--- a/gemfiles/Gemfile.edge-marionette
+++ b/gemfiles/Gemfile.edge-marionette
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem 'bundler', '~> 1.1'
 gemspec :path => '..'
 
-gem 'xpath', github: 'jnicklas/xpath'
+gem 'xpath', github: 'teamcapybara/xpath'
 
 gem 'selenium-webdriver', :path => '../../selenium/build/rb'
 gem 'rack', github: 'rack/rack'
diff --git a/gemfiles/Gemfile.rspec-34 b/gemfiles/Gemfile.rspec-34
index 302b5d6b..6cb23f38 100644
--- a/gemfiles/Gemfile.rspec-34
+++ b/gemfiles/Gemfile.rspec-34
@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gem 'bundler', '~> 1.1'
 gemspec :path => '..'
 
-gem 'xpath', github: 'jnicklas/xpath'
+gem 'xpath', github: 'teamcapybara/xpath'
 gem 'rspec', '~>3.4.0'
 
diff --git a/gemfiles/Gemfile.ruby-19 b/gemfiles/Gemfile.ruby-19
index aedf7516..12a0e932 100644
--- a/gemfiles/Gemfile.ruby-19
+++ b/gemfiles/Gemfile.ruby-19
@@ -4,7 +4,7 @@ gem 'bundler', '~> 1.1'
 gemspec path: '..'
 
 gem 'mime-types', '< 3.0'
-gem 'xpath', :git => 'git://github.com/jnicklas/xpath.git'
+gem 'xpath', :git => 'git://github.com/teamcapybara/xpath.git'
 
 gem 'term-ansicolor', '< 1.4.0'
 gem 'tins', '< 1.7.0'  # 1.7.0 requires ruby 2.0
diff --git a/gemfiles/Gemfile.ruby-20 b/gemfiles/Gemfile.ruby-20
index b785de10..c2249b22 100644
--- a/gemfiles/Gemfile.ruby-20
+++ b/gemfiles/Gemfile.ruby-20
@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gem 'bundler', '~> 1.1'
 gemspec path: '..'
 
-gem 'xpath', :git => 'git://github.com/jnicklas/xpath.git'
+gem 'xpath', :git => 'git://github.com/teamcapybara/xpath.git'
 gem 'nokogiri', '< 1.7.0' # 1.7 requires ruby 2.1+
 gem 'rack', '<2.0' # 2.0 requires ruby 2.2+