diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 079bddffd7a8c0e358f8f79aa93c67e7b6b08c11..d4935278df3aaba8e03dce6ddeddf9bf8c7bf15d 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Remove problematic control chars in rescue template. #5316 [Stefan Kaes]
+
 * Make sure passed routing options are not mutated by routing code. #5314 [Blair Zajac]
 
 * Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. [Jamis Buck]
diff --git a/actionpack/lib/action_controller/templates/rescues/routing_error.rhtml b/actionpack/lib/action_controller/templates/rescues/routing_error.rhtml
index bf7dcb232aa24914d1808f3844564de3927d3a33..ccfa858ccecb153bb4ad8bdf06e8d4d6dd86f6f2 100644
--- a/actionpack/lib/action_controller/templates/rescues/routing_error.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/routing_error.rhtml
@@ -1,10 +1,10 @@
 <h1>Routing Error</h1>
 <p><pre><%=h @exception.message %></pre></p>
 <% unless @exception.failures.empty? %><p>
-	<h2>Failure reasons:</h2>
-	<ol>
-	<% @exception.failures.each do |route, reason| %>
-		<li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+  <h2>Failure reasons:</h2>
+  <ol>
+  <% @exception.failures.each do |route, reason| %>
+    <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
   <% end %>
   </ol>
 </p><% end %>