diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 34011c66d5..ed967db665 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Changed the default name of the input tag generated by FormTagHelper#submit_tag from "submit" to "commit" so it doesn't clash with form.submit() calls in Javascript #1271
+
 * Fixed relative urls support for lighttpd #1048 [Nicholas Seckar/maznawak@nerim.net]
 
 * Correct distance_of_time_in_words for integer arguments and make the second arg optional, treating the first arg as a duration in seconds.  #1458 [madrobby <thomas@fesch.at>]
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 126a407cad..ed8c1c1d3e 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -76,7 +76,7 @@ module ActionView
       end
 
       def submit_tag(value = "Save changes", options = {})
-        tag("input", { "type" => "submit", "name" => "submit", "value" => value }.update(convert_options(options)))
+        tag("input", { "type" => "submit", "name" => "commit", "value" => value }.update(convert_options(options)))
       end
       
       def image_submit_tag(source, options = {})