@@ -1,9 +1,7 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake/rdoctask'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'rspec/core/rake_task'
 
 task :default => [:spec]
@@ -21,10 +19,3 @@ Rake::RDocTask.new(:rdoc) do |task|
   task.rdoc_files.include(['lib/**/*.rb'])
   task.rdoc_files.include(['README.md', 'LICENSE'])
 end
-
-spec = eval(File.read(File.join(File.dirname(__FILE__), "goliath.gemspec")))
-
-desc 'Generate GEM'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end