diff --git a/Rakefile b/Rakefile
index c5f1f967..208cc428 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,9 +2,6 @@ require 'rake'
 require 'rake/clean'
 load 'thin.gemspec'
 
-# Load tasks in tasks/
-Dir['tasks/**/*.rake'].each { |rake| load rake }
-
 task :default => :spec
 
 desc "Build gem packages"
diff --git a/tasks/announce.rake b/rakelib/announce.rake
similarity index 100%
rename from tasks/announce.rake
rename to rakelib/announce.rake
diff --git a/tasks/deploy.rake b/rakelib/deploy.rake
similarity index 100%
rename from tasks/deploy.rake
rename to rakelib/deploy.rake
diff --git a/tasks/email.erb b/rakelib/email.erb
similarity index 100%
rename from tasks/email.erb
rename to rakelib/email.erb
diff --git a/tasks/ext.rake b/rakelib/ext.rake
similarity index 100%
rename from tasks/ext.rake
rename to rakelib/ext.rake
diff --git a/tasks/rdoc.rake b/rakelib/rdoc.rake
similarity index 100%
rename from tasks/rdoc.rake
rename to rakelib/rdoc.rake
diff --git a/tasks/site.rake b/rakelib/site.rake
similarity index 100%
rename from tasks/site.rake
rename to rakelib/site.rake
diff --git a/tasks/spec.rake b/rakelib/spec.rake
similarity index 100%
rename from tasks/spec.rake
rename to rakelib/spec.rake
diff --git a/tasks/stats.rake b/rakelib/stats.rake
similarity index 100%
rename from tasks/stats.rake
rename to rakelib/stats.rake