diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9fb7a73a9..759c50086 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -58,6 +58,7 @@ Don Ferguson
 Don Jeffery
 Drew Sudell
 Eli Tucker
+Emmanuel Bourg
 Eric Pugh
 Erik Hatcher
 Erik Langenbach
diff --git a/WHATSNEW b/WHATSNEW
index 3906d21b6..f1de02aa0 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -151,6 +151,11 @@ Changes that could break older environments:
   handled to nested projects.
   Bugzilla report 25777
 
+* <junit> with filtertrace="true" will now also swallow lines for the
+  sun.reflect package.  If you need to see them in your stack trace,
+  you must set filtertrace to false.
+  Bugzilla Report 22758
+
 Other changes:
 --------------
 
diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html
index 90b94222d..3f2e26c85 100644
--- a/docs/manual/OptionalTasks/junit.html
+++ b/docs/manual/OptionalTasks/junit.html
@@ -207,6 +207,7 @@ that begin with the following string patterns:<pre>
    "junit.awtui.TestRunner"
    "junit.textui.TestRunner"
    "java.lang.reflect.Method.invoke("
+   "sun.reflect."
    "org.apache.tools.ant."</pre></p>
 
 <h3><a name="nested">Nested Elements</a></h3>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 13fbc399b..1c022a971 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2004 The Apache Software Foundation
+ * Copyright  2000-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.
@@ -113,6 +113,7 @@ public class JUnitTestRunner implements TestListener {
                 "junit.awtui.TestRunner",
                 "junit.textui.TestRunner",
                 "java.lang.reflect.Method.invoke(",
+                "sun.reflect.",
                 "org.apache.tools.ant."
         };