diff --git a/WHATSNEW b/WHATSNEW
index a1a5311a5..d606b94c4 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,5 +1,5 @@
-Changes from current Ant 1.6 CVS version to current CVS version
-=============================================
+Changes from current Ant 1.6.5 version to current CVS version
+=============================================================
 
 Changes that could break older environments:
 --------------------------------------------
@@ -113,6 +113,9 @@ Fixed bugs:
 * <tar> / <untar> now accepts files upto 8GB, <tar> gives an error if larger 
   files are to be included. This is the POSIX size limit.
 
+* <junitreport> removed line-breaks from stack-traces.  Bugzilla
+  Report 34963.
+
 Other changes:
 --------------
 
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 4a1157840..6c28af497 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -701,8 +701,7 @@ h6 {
 -->
 <xsl:template name="br-replace">
     <xsl:param name="word"/>
-    <xsl:param name="br"><br/></xsl:param>
-    <xsl:value-of select='stringutils:replace(string($word),"&#xA;",$br)'/>
+    <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"&#xA;","&lt;br/>")'/>
 </xsl:template>
 
 <xsl:template name="display-time">
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index d71f4e693..f6868bd2a 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -5,7 +5,7 @@
   doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
 <xsl:decimal-format decimal-separator="." grouping-separator="," />
 <!--
-   Copyright 2001-2004 The Apache Software Foundation
+   Copyright 2001-2005 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -447,8 +447,7 @@
 -->
 <xsl:template name="br-replace">
     <xsl:param name="word"/>
-    <xsl:param name="br"><br/></xsl:param>
-    <xsl:value-of select='stringutils:replace(string($word),"&#xA;",$br)'/>
+    <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"&#xA;","&lt;br/>")'/>
 </xsl:template>
 
 <xsl:template name="display-time">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
index 25a5c82c5..b41d567c8 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
@@ -91,7 +91,7 @@ public class JUnitReportTest extends BuildFileTest {
     }
 
     // Bugzilla Report 34963
-    public void XtestStackTraceLineBreaks() throws Exception {
+    public void testStackTraceLineBreaks() throws Exception {
         expectReportWithText("testStackTraceLineBreaks", null);
         FileReader r = null;
         try {