diff --git a/README.rdoc b/README.rdoc
index d3e6518ae..9d1f04279 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -105,7 +105,7 @@ geemus says: "That should give you everything you need to get started, but let m
 
 == Contributing
 
-* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the {issues}[http://github.com/geemus/fog/issues]
+* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the {issues}[http://github.com/fog/fog/issues]
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
 * Rebase your branch against geemus/fog to make sure everything is up to date.
@@ -116,7 +116,7 @@ geemus says: "That should give you everything you need to get started, but let m
 Wonder how you can get a lovely fog shirt? Look no further!
 
 * Blue shirts go to people who have contributed indirectly, great examples are writing blog posts or giving lightning talks.
-* Grey shirts and a follow from @fog go to people who have made it on to the {contributors list}[https://github.com/geemus/fog/contributors] by submitting code.
+* Grey shirts and a follow from @fog go to people who have made it on to the {contributors list}[https://github.com/fog/fog/contributors] by submitting code.
 * Black shirts go to people who have made it on to the {collaborators list}[https://github.com/api/v2/json/repos/show/geemus/fog/collaborators] by coercing geemus into adding them.
 
 == Additional Resources
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 28b199a36..4730aeb88 100755
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -35,7 +35,7 @@
       <dl>
         <dt>version</dt><dd>vX.Y.Z</dd>
         <dt>install</dt><dd><code>gem install fog</code></dd>
-        <dt>source</dt><dd><a href="http://github.com/geemus/fog">geemus/fog</a></dd>
+        <dt>source</dt><dd><a href="http://github.com/fog/fog">geemus/fog</a></dd>
       </dl>
     </header>
 
diff --git a/docs/about/contributing.markdown b/docs/about/contributing.markdown
index 79803ea38..7d3af6b2e 100644
--- a/docs/about/contributing.markdown
+++ b/docs/about/contributing.markdown
@@ -86,7 +86,7 @@ end
 
 ## Tests
 
-Now would be a good time to write some tests to make sure what you have written works (and will continue to). I've tried a couple variations on testing in the past, but have settled on consolidated lifetime testing. These vary enough that its hard to give a single simple example, but you can see many examples in "tests/compute/requests/aws":https://github.com/geemus/fog/tree/master/tests/compute/requests/aws/.
+Now would be a good time to write some tests to make sure what you have written works (and will continue to). I've tried a couple variations on testing in the past, but have settled on consolidated lifetime testing. These vary enough that its hard to give a single simple example, but you can see many examples in "tests/compute/requests/aws":https://github.com/fog/fog/tree/master/tests/compute/requests/aws/.
 
 ### Highlights:
 * Reuse the same objects and take them through their whole life cycle (this is much faster, and most of the time if one portion fails the others would anyway).
diff --git a/docs/dns/index.markdown b/docs/dns/index.markdown
index 3c821ed90..3de8cbf2e 100644
--- a/docs/dns/index.markdown
+++ b/docs/dns/index.markdown
@@ -76,4 +76,4 @@ If you already have an account with another service you can just as easily use t
 
 ## Go Forth and Resolve
 
-You can see an example of reusing code like this in the <a href="https://github.com/geemus/fog/blob/master/examples/dns_tests.rb">examples folder</a>. Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.
+You can see an example of reusing code like this in the <a href="https://github.com/fog/fog/blob/master/examples/dns_tests.rb">examples folder</a>. Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.
diff --git a/docs/index.markdown b/docs/index.markdown
index ba20c6112..1e0a785f7 100644
--- a/docs/index.markdown
+++ b/docs/index.markdown
@@ -42,7 +42,7 @@ geemus says: "That should give you everything you need to get started, but let m
 
 ## Contributing
 
-* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/geemus/fog/issues)
+* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
 * Rebase your branch against geemus/fog to make sure everything is up to date.
@@ -53,7 +53,7 @@ geemus says: "That should give you everything you need to get started, but let m
 Wonder how you can get a lovely fog shirt? Look no further!
 
 * Blue shirts go to people who have contributed indirectly, great examples are writing blog posts or giving lightning talks.
-* Grey shirts and a follow from @fog go to people who have made it on to the [contributors list](https://github.com/geemus/fog/contributors) by submitting code.
+* Grey shirts and a follow from @fog go to people who have made it on to the [contributors list](https://github.com/fog/fog/contributors) by submitting code.
 * Black shirts go to people who have made it on to the [collaborators list](https://github.com/api/v2/json/repos/show/geemus/fog/collaborators) by coercing geemus into adding them.
 
 ## Resources
@@ -65,7 +65,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 * Stay up to date by following [@fog](http://twitter.com/fog) and/or [@geemus](http://twitter.com/geemus) on Twitter.
 * Get and give help on the [#ruby-fog](irc://irc.freenode.net/ruby-fog) irc channel on Freenode
 * Follow release notes and discussions on the [mailing list](http://groups.google.com/group/ruby-fog)
-* Report bugs or find tasks to help with in the [issues](http://github.com/geemus/fog/issues)
+* Report bugs or find tasks to help with in the [issues](http://github.com/fog/fog/issues)
 * Learn about [contributing](/about/contributing.html)
 * See where fog is used and let the world know how you use it [in the wild](/about/users.html)
 * Check out blog posts and other mentions in the [press](/about/press.html)
diff --git a/docs/storage/index.markdown b/docs/storage/index.markdown
index 1de5cec22..b81bce78c 100644
--- a/docs/storage/index.markdown
+++ b/docs/storage/index.markdown
@@ -5,13 +5,13 @@ title:  Storage
 
 Having Ruby experience makes you hirable; but how can you stand out? You need to demonstrate your abilities. What better way than using Ruby and "the cloud" to store and serve your resume!
 
-In this blog post you will learn to use <a href="http://github.com/geemus/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
+In this blog post you will learn to use <a href="http://github.com/fog/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
 
 Here's my out of date resume stored on <a href="http://geemus.s3.amazonaws.com/resume.html">S3</a>, <a href="http://c0023559.cdn2.cloudfiles.rackspacecloud.com/resume.html">CloudFiles</a> and <a href="https://geemus.commondatastorage.googleapis.com/resume.html">Google Storage</a>; programmatically stored in the cloud using this tutorial. NOTE: my boss would like me to add that I'm not currently looking for a new gig ;)
 
 Check out those cloud-specific URLs! You could put all three in your job application, add the Ruby source for how you did it, and have your choice of Ruby jobs for being so awesome!
 
-How? The all-clouds-in-one library of choice is <a href="https://github.com/geemus/fog">fog</a>.
+How? The all-clouds-in-one library of choice is <a href="https://github.com/fog/fog">fog</a>.
 
 ## Installing fog
 
diff --git a/fog.gemspec b/fog.gemspec
index d518a8574..5b115d399 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["geemus (Wesley Beary)"]
   s.email    = 'geemus@gmail.com'
-  s.homepage = 'http://github.com/geemus/fog'
+  s.homepage = 'http://github.com/fog/fog'
 
   ## This sections is only necessary if you have C extensions.
   # s.require_paths << 'ext'