diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b56a78f2544c25299069ffa458b293d7e416a3d6..c3618cda0b37784ff14432e757a9cf674f184052 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [DHH]
+
 * Added app/services as a default dir in the Rails skeleton and to the load path. Use it to keep classes like MaintenanceService and PaymentGateway [DHH]
 
 * Fixed scaffold generator when started with only 1 parameter #2609 [self@mattmower.com]
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 220262bf099e31abde20f7b33b409659a9f24f03..79bb808d7bd8c92616b41bb5a45bf42bce30191d 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -26,7 +26,6 @@ def manifest
       # Root
       m.file "fresh_rakefile", "Rakefile"
       m.file "README",         "README"
-      m.file "CHANGELOG",      "CHANGELOG"
 
       # Application
       m.template "helpers/application.rb",        "app/controllers/application.rb"
diff --git a/railties/lib/rails_generator/generators/components/plugin/USAGE b/railties/lib/rails_generator/generators/components/plugin/USAGE
new file mode 100644
index 0000000000000000000000000000000000000000..55e35be5958dc9c8f4ad7c6cee8dffb012fee803
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/USAGE
@@ -0,0 +1,18 @@
+Description:
+    The plugin generator creates stubs for a new plugin.
+
+    The generator takes a plugin name as its argument.  The plugin name may be
+    given in CamelCase or under_score and should not be suffixed with 'Plugin'.
+
+    The generator creates a plugin directory in vendor/plugins that includes
+    both init.rb and README files as well as lib, task, and test directories.
+
+Example:
+    ./script/generate plugin BrowserFilters
+
+    This will create:
+        vendor/plugins/browser_filters/README
+        vendor/plugins/browser_filters/init.rb
+        vendor/plugins/browser_filters/lib/browser_filters.rb
+        vendor/plugins/browser_filters/test/browser_filters_test.rb
+        vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2db7f98f8d3106f50866a1bf91c5952f04f46cab
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb
@@ -0,0 +1,17 @@
+class PluginGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.directory File.join('vendor', 'plugins', file_name)
+      m.directory File.join('vendor', 'plugins', file_name, 'lib')
+      m.directory File.join('vendor', 'plugins', file_name, 'test')
+      m.directory File.join('vendor', 'plugins', file_name, 'tasks')
+
+      m.template 'plugin.rb',    File.join('vendor', 'plugins', file_name, 'lib',  "#{file_name}.rb")
+      m.template 'unit_test.rb', File.join('vendor', 'plugins', file_name, 'test', "#{file_name}_test.rb")
+
+      m.template 'init.rb',    File.join('vendor', 'plugins', file_name, 'init.rb')
+      m.template 'tasks.rake', File.join('vendor', 'plugins', file_name, 'tasks', "#{file_name}_tasks.rake")
+      m.template 'README',     File.join('vendor', 'plugins', file_name, 'README')
+    end
+  end
+end
diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/README b/railties/lib/rails_generator/generators/components/plugin/templates/README
new file mode 100644
index 0000000000000000000000000000000000000000..d72764134044d12cd38a2b6549d523893ca5d5fa
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/templates/README
@@ -0,0 +1,4 @@
+<%= class_name %>
+<%= "=" * class_name.size %>
+
+Description goes here
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/init.rb b/railties/lib/rails_generator/generators/components/plugin/templates/init.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ada2eece96dd0f7ef39d23dc6aa10ea107145ddc
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/templates/init.rb
@@ -0,0 +1 @@
+# Include hook code here
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb b/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1fa5b9028fd7864e9672ef8403e414b7dc3035d2
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb
@@ -0,0 +1 @@
+# <%= class_name %>
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake b/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake
new file mode 100644
index 0000000000000000000000000000000000000000..5222b22c27187350c4a6ebc328d88e8b013e19de
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake
@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :<%= file_name %> do
+#   # Task goes here
+# end
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/components/plugin/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/plugin/templates/unit_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..44e4b54c2ef9b606371c237defeafa87611155e9
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/plugin/templates/unit_test.rb
@@ -0,0 +1,6 @@
+class <%= class_name %>Test < Test::Unit::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end