diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 35fb6dc42580409f003f6aab9488ae8de6e22b6a..6cefa0754212359c86eaec2c6d36331d89d0e23e 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Make table_name and controller_name in generators honor AR::Base.pluralize_table_names. #2213 [kazuhiko@fdiary.net]
+
 * Clearly label functional and unit tests in rake stats output.  #2297 [lasse.koskela@gmail.com]
 
 * Make the migration generator only check files ending in *.rb when calculating the next file name #2317 [Chad Fowler]
diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb
index f7aa2169caade1ef7297e335bd363ea0391e2f6b..6a56f96b1c59633c0c91fdafb7e59e727f4fc980 100644
--- a/railties/lib/rails_generator/base.rb
+++ b/railties/lib/rails_generator/base.rb
@@ -144,10 +144,9 @@ def usage_message
     #
     # See Rails::Generator::Base for a discussion of Manifests and Commands.
     class NamedBase < Base
-      attr_reader   :name, :class_name, :singular_name, :plural_name
+      attr_reader   :name, :class_name, :singular_name, :plural_name, :table_name
       attr_reader   :class_path, :file_path, :class_nesting, :class_nesting_depth
       alias_method  :file_name,  :singular_name
-      alias_method  :table_name, :plural_name
       alias_method  :actions, :args
 
       def initialize(runtime_args, runtime_options = {})
@@ -172,6 +171,7 @@ def assign_names!(name)
           @name = name
           base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
           @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
+          @table_name = ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name
           if @class_nesting.empty?
             @class_name = @class_name_without_nesting
           else
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index 5ffe428fcee5b721c9357b5adc1c25094c009094..0f789efc836b988d85248c1c7ee99803905d1db1 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -46,7 +46,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    @controller_name = args.shift || @name.pluralize
+    @controller_name = args.shift || ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
     @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
     if @controller_class_nesting.empty?
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 3f6350938444691bd1553520c162cc59c2eab42b..00cd94596bd104b9d45d3313ba2f6d77fda55d88 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -74,6 +74,7 @@ def test_generator_spec
   end
 
   def test_named_generator_attributes
+    ActiveRecord::Base.pluralize_table_names = true
     g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
     assert_equal 'admin/foo', g.name
     assert_equal %w(admin), g.class_path
@@ -85,4 +86,10 @@ def test_named_generator_attributes
     assert_equal g.plural_name, g.table_name
     assert_equal %w(bar baz), g.args
   end
+
+  def test_named_generator_attributes_without_pluralized
+    ActiveRecord::Base.pluralize_table_names = false
+    g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
+    assert_equal g.singular_name, g.table_name
+  end
 end