1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/generators/active_record/model/model_generator.rb b/railties/lib/generators/active_record/model/model_generator.rb
index 54187aede0..5c6033629f 100644
--- a/railties/lib/generators/active_record/model/model_generator.rb
+++ b/railties/lib/generators/active_record/model/model_generator.rb
@@ -13,7 +13,9 @@ module ActiveRecord
 
       def create_migration_file
         if options[:migration] && options[:parent].nil?
-          file_name = "create_#{file_path.gsub(/\//, '_').pluralize}"
+          klass_name = file_path.gsub(/\//, '_')
+          klass_name = klass_name.pluralize if ActiveRecord::Base.pluralize_table_names
+          file_name = "create_#{klass_name}"
           migration_template "migration.rb", "db/migrate/#{file_name}.rb"
         end
       end