diff --git a/Rakefile b/Rakefile
index 0c955a1..c402432 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,7 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'rake/gempackagetask'
+require 'bundler'
 require 'cucumber/rake/task'
 
-eval("$specification = #{IO.read('factory_girl_rails.gemspec')}")
-Rake::GemPackageTask.new($specification) do |package|
-  package.need_zip = true
-  package.need_tar = true
-end
+Bundler::GemHelper.install_tasks
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
diff --git a/factory_girl_rails.gemspec b/factory_girl_rails.gemspec
index cd0335d..f477827 100644
--- a/factory_girl_rails.gemspec
+++ b/factory_girl_rails.gemspec
@@ -1,26 +1,26 @@
 Gem::Specification.new do |s|
   s.name        = %q{factory_girl_rails}
   s.version     = '1.3.0'
+  s.authors     = ["Joe Ferris"]
+  s.email       = %q{jferris@thoughtbot.com}
+  s.homepage    = "http://github.com/thoughtbot/factory_girl_rails"
   s.summary     = %q{factory_girl_rails provides integration between
     factory_girl and rails 3}
   s.description = %q{factory_girl_rails provides integration between
     factory_girl and rails 3 (currently just automatic factory definition
     loading)}
-  s.files        = Dir['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb', 'features/**/*']
-  s.require_path = 'lib'
-  s.test_files   = Dir['spec/**/*_spec.rb', 'features/**/*']
-  s.authors = ["Joe Ferris"]
-  s.email   = %q{jferris@thoughtbot.com}
-  s.homepage = "http://github.com/thoughtbot/factory_girl_rails"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
   s.add_runtime_dependency('railties', '>= 3.0.0')
   s.add_runtime_dependency('factory_girl', '~> 2.2.0')
+
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 2.6.0')
   s.add_development_dependency('cucumber', '~> 1.0.0')
   s.add_development_dependency('aruba')
   s.add_development_dependency('rails', '3.0.7')
-
-  s.platform = Gem::Platform::RUBY
-  s.rubygems_version = %q{1.2.0}
 end
-
diff --git a/lib/factory_girl_rails/version.rb b/lib/factory_girl_rails/version.rb
new file mode 100644
index 0000000..bc14d7a
--- /dev/null
+++ b/lib/factory_girl_rails/version.rb
@@ -0,0 +1 @@
+module FactoryGirl