diff --git a/Rakefile b/Rakefile
index a5472159..8ef1a1ab 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,8 +55,8 @@ EOF
     s.rdoc_options = rd.options
 
     s.authors = ['Scott Barron', 'Scott Petersen', 'Travis Tilley']
-    s.email = 'ttilley@gmail.com'
-    s.homepage = 'http://github.com/ttilley/aasm'
+    s.email = 'scott@elitists.net'
+    s.homepage = 'http://github.com/rubyist/aasm'
   end
 
   package_task = Rake::GemPackageTask.new(spec) do |pkg|
diff --git a/aasm.gemspec b/aasm.gemspec
deleted file mode 100644
index 402dd4a3..00000000
--- a/aasm.gemspec
+++ /dev/null
@@ -1,19 +0,0 @@
-PKG_FILES = ["CHANGELOG", "MIT-LICENSE", "Rakefile", "README.rdoc", "TODO", "lib/aasm.rb", "lib/aasm/aasm.rb", "lib/aasm/event.rb", "lib/aasm/persistence/active_record_persistence.rb", "lib/aasm/persistence.rb", "lib/aasm/state.rb", "lib/aasm/state_machine.rb", "lib/aasm/state_transition.rb", "doc/jamis.rb"]
-
-Gem::Specification.new do |s|
-  s.name = 'aasm'
-  s.version = "2.1.1"
-  s.summary = 'State machine mixin for Ruby objects'
-  s.description = <<-EOF
-AASM is a continuation of the acts as state machine rails plugin, built for plain Ruby objects.
-EOF
-  s.files = PKG_FILES
-  s.require_path = 'lib'
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE', 'TODO', 'CHANGELOG']
-  s.rdoc_options = ['--line-numbers', '--inline-source', '--main', 'README.rdoc', '--title', 'AASM']
-  
-  s.author = 'Scott Barron'
-  s.email = 'scott@elitists.net'
-  s.homepage = 'http://github.com/rubyist/aasm'
-end