diff --git a/README.md b/README.md
index 600c1d7..e98f296 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,17 @@
 
 **A library that provides functionalities needed for the diaspora* federation protocol**
 
-**master:** [![Build Status master](https://travis-ci.org/SuperTux88/diaspora_federation.svg?branch=master)](https://travis-ci.org/SuperTux88/diaspora_federation)
-**develop:** [![Build Status develop](https://travis-ci.org/SuperTux88/diaspora_federation.svg?branch=develop)](https://travis-ci.org/SuperTux88/diaspora_federation)
+**master:** [![Build Status master](https://travis-ci.org/diaspora/diaspora_federation.svg?branch=master)](https://travis-ci.org/diaspora/diaspora_federation)
+**develop:** [![Build Status develop](https://travis-ci.org/diaspora/diaspora_federation.svg?branch=develop)](https://travis-ci.org/diaspora/diaspora_federation)
 
-[![Code Climate](https://codeclimate.com/github/SuperTux88/diaspora_federation/badges/gpa.svg)](https://codeclimate.com/github/SuperTux88/diaspora_federation)
-[![Test Coverage](https://codeclimate.com/github/SuperTux88/diaspora_federation/badges/coverage.svg)](https://codeclimate.com/github/SuperTux88/diaspora_federation/coverage)
-[![Dependency Status](https://gemnasium.com/SuperTux88/diaspora_federation.svg)](https://gemnasium.com/SuperTux88/diaspora_federation)
-[![Inline docs](https://inch-ci.org/github/SuperTux88/diaspora_federation.svg?branch=master)](https://inch-ci.org/github/SuperTux88/diaspora_federation)
+[![Code Climate](https://codeclimate.com/github/diaspora/diaspora_federation/badges/gpa.svg)](https://codeclimate.com/github/diaspora/diaspora_federation)
+[![Test Coverage](https://codeclimate.com/github/diaspora/diaspora_federation/badges/coverage.svg)](https://codeclimate.com/github/diaspora/diaspora_federation/coverage)
+[![Dependency Status](https://gemnasium.com/diaspora/diaspora_federation.svg)](https://gemnasium.com/diaspora/diaspora_federation)
+[![Inline docs](https://inch-ci.org/github/diaspora/diaspora_federation.svg?branch=master)](https://inch-ci.org/github/diaspora/diaspora_federation)
 [![Gem Version](https://badge.fury.io/rb/diaspora_federation.svg)](https://badge.fury.io/rb/diaspora_federation)
 
 [Documentation](http://www.rubydoc.info/gems/diaspora_federation/) |
-[Bugtracker](https://github.com/SuperTux88/diaspora_federation/issues)
+[Bugtracker](https://github.com/diaspora/diaspora_federation/issues)
 
 ## Library
 
diff --git a/diaspora_federation-rails.gemspec b/diaspora_federation-rails.gemspec
index 9ec3b2a..0d50485 100644
--- a/diaspora_federation-rails.gemspec
+++ b/diaspora_federation-rails.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = DiasporaFederation::VERSION
   s.authors     = ["Benjamin Neff"]
   s.email       = ["benjamin@coding4.coffee"]
-  s.homepage    = "https://github.com/SuperTux88/diaspora_federation"
+  s.homepage    = "https://github.com/diaspora/diaspora_federation"
   s.summary     = "diaspora* federation rails engine"
   s.description = "A rails engine that adds the diaspora* federation protocol to a rails app"
   s.license     = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
diff --git a/diaspora_federation-test.gemspec b/diaspora_federation-test.gemspec
index f6c71de..2a4929c 100644
--- a/diaspora_federation-test.gemspec
+++ b/diaspora_federation-test.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = DiasporaFederation::VERSION
   s.authors     = ["Benjamin Neff"]
   s.email       = ["benjamin@coding4.coffee"]
-  s.homepage    = "https://github.com/SuperTux88/diaspora_federation"
+  s.homepage    = "https://github.com/diaspora/diaspora_federation"
   s.summary     = "diaspora* federation test utils"
   s.description = "This gem provides some supplimentary code (factory definitions), that"\
                   "helps to build tests for users of the diaspora_federation gem."
diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec
index 2278d63..5c28e52 100644
--- a/diaspora_federation.gemspec
+++ b/diaspora_federation.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = DiasporaFederation::VERSION
   s.authors     = ["Benjamin Neff"]
   s.email       = ["benjamin@coding4.coffee"]
-  s.homepage    = "https://github.com/SuperTux88/diaspora_federation"
+  s.homepage    = "https://github.com/diaspora/diaspora_federation"
   s.summary     = "diaspora* federation library"
   s.description = "This gem provides the functionality for de-/serialization and " \
                   "de-/encryption of Entities in the protocols used for communication " \