diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2a9bc9027a..ab4edf3ba6 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Added POST support for the breakpoint retries, so form processing that raises an exception can be retried with the original request [Florian Gross]
+
+
 *1.0.1*
 
 * Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times [evl]
diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
index c993fb3b19..afdd19c6c1 100644
--- a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
@@ -1,4 +1,15 @@
-<% if defined?(Breakpoint) then %><a href="?BP-RETRY=1">Retry with Breakpoint</a><% end %>
+<% if defined?(Breakpoint) %>
+  <br /><br />
+  <%= form_tag({}, "method" => @request.method) %>
+    <input type="hidden" name="BP-RETRY" value="1" />
+
+    <% for key, value in @request.params %>
+      <input type="hidden" name="<%= key %>" value="<%= value %>" />
+    <% end %>
+
+    <input type="submit" value="Retry with Breakpoint" />
+  </form>
+<% end %>
 
 <%
   request_parameters_without_action = @request.parameters.clone