diff --git a/Rakefile b/Rakefile
index 5ae703e..3a345c5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,18 @@
 require 'rake'
+require 'rake/clean'
 require 'rdoc/task'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'bundler'
+
+task :default => :spec
+
+CLEAN.replace %w(pkg doc)
 
 RDoc::Task.new do |rdoc|
-  files = [#'README', 'LICENSE', 'COPYING',
+  files = [
            'lib/**/*.rb',
-           'rdoc/*.rdoc'#, 'test/*.rb'
+           'rdoc/*.rdoc'
   ]
   rdoc.rdoc_files.add(files)
   rdoc.main = "rdoc/main.rdoc" # page to start on
@@ -14,11 +22,8 @@ RDoc::Task.new do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
 end
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-
-
+Bundler::GemHelper.install_tasks