diff --git a/Rakefile b/Rakefile
index 4e621db64..84d9f9287 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,14 @@
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
 require 'rake'
-require 'rcov/rcovtask'
 require 'date'
-require 'rake/gempackagetask'
-require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 require 'appraisal'
 require 'yard'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+require 'rcov/rcovtask'
+
+Bundler::GemHelper.install_tasks
 
 desc 'Default: run the specs and features.'
 task :default => 'spec:unit' do
@@ -45,12 +46,6 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-eval("$specification = begin; #{IO.read('factory_girl.gemspec')}; end")
-Rake::GemPackageTask.new($specification) do |package|
-  package.need_zip = true
-  package.need_tar = true
-end
-
 YARD::Rake::YardocTask.new do |t|
 end