6 files changed, 9 insertions, 7 deletions
diff --git a/railties/lib/generators/rails/plugin/plugin_generator.rb b/railties/lib/generators/rails/plugin/plugin_generator.rb
index 9eaf902021..903f720e12 100644
--- a/railties/lib/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/generators/rails/plugin/plugin_generator.rb
@@ -26,7 +26,7 @@ module Rails
 
       def create_generator_files
         return unless options[:generator]
-        directory 'generators', plugin_dir('generators')
+        directory 'lib/generators', plugin_dir('lib/generators')
       end
 
       protected
diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt b/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt
deleted file mode 100644
index 90aa557eeb..0000000000
--- a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/%file_name%_generator.rb.tt
+++ /dev/null
@@ -1,2 +0,0 @@
-class <%= class_name %>Generator < Rails::Generators::NamedBase
-end
diff --git a/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt b/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt
new file mode 100644
index 0000000000..675f00043f
--- /dev/null
+++ b/railties/lib/generators/rails/plugin/templates/lib/generators/%file_name%_generator.rb.tt
@@ -0,0 +1,5 @@
+class <%= class_name %>Generator < Rails::Generators::NamedBase
+  def self.source_root
+    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+  end
+end
diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt b/railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt
index ea9f4f12cc..ea9f4f12cc 100644
--- a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/USAGE.tt
+++ b/railties/lib/generators/rails/plugin/templates/lib/generators/USAGE.tt
diff --git a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/templates/.empty_directory b/railties/lib/generators/rails/plugin/templates/lib/generators/templates/.empty_directory
index e69de29bb2..e69de29bb2 100644
--- a/railties/lib/generators/rails/plugin/templates/generators/%file_name%/templates/.empty_directory
+++ b/railties/lib/generators/rails/plugin/templates/lib/generators/templates/.empty_directory
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index b9f09d5163..2b41f85a2d 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -37,10 +37,9 @@ class PluginGeneratorTest < GeneratorsTestCase
 
   def test_creates_generator_if_required
     run_generator ["plugin_fu", "--generator"]
-    assert_file "vendor/plugins/plugin_fu/generators/plugin_fu/templates"
-
-    flag = /class PluginFuGenerator < Rails::Generators::NamedBase/
-    assert_file "vendor/plugins/plugin_fu/generators/plugin_fu/plugin_fu_generator.rb", flag
+    assert_file "vendor/plugins/plugin_fu/lib/generators/templates"
+    assert_file "vendor/plugins/plugin_fu/lib/generators/plugin_fu_generator.rb",
+                /class PluginFuGenerator < Rails::Generators::NamedBase/
   end
 
   def test_plugin_generator_on_revoke