diff --git a/README.md b/README.md
index 8964a8c..276179c 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,7 @@ This model can change AASM states which are stored into the database, even if th
 
 ## Changelog ##
 
-Look at the [CHANGELOG](https://github.com/rubyist/aasm/blob/master/CHANGELOG.md) for details.
+Look at the [CHANGELOG](https://github.com/aasm/aasm/blob/master/CHANGELOG.md) for details.
 
 
 ## Authors ##
diff --git a/aasm.gemspec b/aasm.gemspec
index 6147bd7..a4762b6 100644
--- a/aasm.gemspec
+++ b/aasm.gemspec
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "aasm"
   s.version     = AASM::VERSION
   s.authors     = ["Scott Barron", "Scott Petersen", "Travis Tilley", "Thorsten Boettger"]
-  s.email       = %q{scott@elitists.net, ttilley@gmail.com}
-  s.homepage    = %q{http://rubyist.github.com/aasm/}
+  s.email       = %q{scott@elitists.net, ttilley@gmail.com, @aasm@mt7.de}
+  s.homepage    = %q{http://github.com/aasm/aasm}
   s.summary     = %q{State machine mixin for Ruby objects}
   s.description = %q{AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.}
   s.date        = Time.now