diff --git a/README.md b/README.md
index 672cb64a..3f22f114 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@ Poltergeist is a driver for [Capybara](https://github.com/jnicklas/capybara). It
 run your Capybara tests on a headless [WebKit](http://webkit.org) browser,
 provided by [PhantomJS](http://www.phantomjs.org/).
 
-**If you're viewing this at https://github.com/jonleighton/poltergeist,
+**If you're viewing this at https://github.com/teampoltergeist/poltergeist,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(1.5.0).](https://github.com/jonleighton/poltergeist/tree/v1.5.0)**
+(1.5.0).](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0)**
 
 ## Getting help ##
 
@@ -17,7 +17,7 @@ Questions should be posted [on Stack
 Overflow, using the 'poltergeist' tag](http://stackoverflow.com/questions/tagged/poltergeist).
 
 Bug reports should be posted [on
-GitHub](https://github.com/jonleighton/poltergeist/issues) (and be sure
+GitHub](https://github.com/teampoltergeist/poltergeist/issues) (and be sure
 to read the bug reporting guidance below).
 
 ## Installation ##
diff --git a/poltergeist.gemspec b/poltergeist.gemspec
index abafc180..e8bea92e 100644
--- a/poltergeist.gemspec
+++ b/poltergeist.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Jon Leighton']
   s.email       = ['j@jonathanleighton.com']
-  s.homepage    = 'http://github.com/jonleighton/poltergeist'
+  s.homepage    = 'http://github.com/teampoltergeist/poltergeist'
   s.summary     = 'PhantomJS driver for Capybara'
   s.description = 'Poltergeist is a driver for Capybara that allows you to '\
                   'run your tests on a headless WebKit browser, provided by '\
diff --git a/spec/integration/session_spec.rb b/spec/integration/session_spec.rb
index 6d48699d..a07b5704 100644
--- a/spec/integration/session_spec.rb
+++ b/spec/integration/session_spec.rb
@@ -246,7 +246,7 @@
         end
       end
 
-      # See https://github.com/jonleighton/poltergeist/issues/60
+      # See https://github.com/teampoltergeist/poltergeist/issues/60
       it "fixes some weird layout issue that we're not entirely sure about the reason for" do
         @session.visit '/poltergeist/datepicker'
         @session.find(:css, '#datepicker').set('2012-05-11')
@@ -304,7 +304,7 @@
       before do
         @session.visit '/poltergeist/double_click_test'
       end
-      
+
       it 'double clicks properly' do
         @session.driver.resize(200, 200)
         log = @session.find(:css, '#log')
@@ -316,7 +316,7 @@
         end
       end
     end
-    
+
     context 'status code support', :status_code_support => true do
       it 'determines status code when an user goes to a page by using a link on it' do
         @session.visit '/poltergeist/with_different_resources'
@@ -530,7 +530,7 @@
       end
     end
 
-    # see https://github.com/jonleighton/poltergeist/issues/115
+    # see https://github.com/teampoltergeist/poltergeist/issues/115
     it "handles obsolete node during an attach_file" do
       @session.visit "/poltergeist/attach_file"
       @session.attach_file "file", __FILE__