diff --git a/Rakefile b/Rakefile
index ffbd9e64e..01e62ddd6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -37,5 +37,3 @@ task :default => 'spec'
 
 WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
 SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
diff --git a/tasks/gem.rake b/rakelib/gem.rake
similarity index 100%
rename from tasks/gem.rake
rename to rakelib/gem.rake
diff --git a/tasks/git.rake b/rakelib/git.rake
similarity index 100%
rename from tasks/git.rake
rename to rakelib/git.rake
diff --git a/tasks/metrics.rake b/rakelib/metrics.rake
similarity index 100%
rename from tasks/metrics.rake
rename to rakelib/metrics.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/wiki.rake b/rakelib/wiki.rake
similarity index 100%
rename from tasks/wiki.rake
rename to rakelib/wiki.rake
diff --git a/tasks/yard.rake b/rakelib/yard.rake
similarity index 100%
rename from tasks/yard.rake
rename to rakelib/yard.rake