diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 4b0d8fc98a..f6dc8f238f 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Update scaffold to use new form_tag block functionality.  Closes #6480. [BobSilva]
+
 * Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
 
 * Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml
index 2db0909cb8..a86aa0b0d5 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml
@@ -1,9 +1,9 @@
 <h1>Editing <%= singular_name %></h1>
 
-<%%= start_form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> %>
+<%% form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> do %>
   <%%= render :partial => 'form' %>
   <%%= submit_tag 'Edit' %>
-<%%= end_form_tag %>
+<%% end %>
 
 <%%= link_to 'Show', :action => 'show<%= suffix %>', :id => @<%= singular_name %> %> |
 <%%= link_to 'Back', :action => 'list<%= suffix %>' %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
index 286f850718..8222ea622f 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
@@ -1,8 +1,8 @@
 <h1>New <%= singular_name %></h1>
 
-<%%= start_form_tag :action => 'create<%= @suffix %>' %>
+<%% form_tag :action => 'create<%= @suffix %>' do %>
   <%%= render :partial => 'form' %>
   <%%= submit_tag "Create" %>
-<%%= end_form_tag %>
+<%% end %>
 
 <%%= link_to 'Back', :action => 'list<%= suffix %>' %>