diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 0c09730963..c3b81bcd3e 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -27,7 +27,7 @@ module Rails
     end
 
     def load_tasks
-      Dir["#{path}/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+      Dir["#{path}/{tasks,lib/tasks,rails/tasks}/**/*.rake"].sort.each { |ext| load ext }
     end
 
     initializer :add_to_load_path, :after => :set_autoload_paths do |app|