diff --git a/NOTICE b/NOTICE
index 5ef72b968..439daad13 100644
--- a/NOTICE
+++ b/NOTICE
@@ -5,7 +5,7 @@
    =========================================================================
 
    Apache Ant
-   Copyright 1999-2006 The Apache Software Foundation
+   Copyright 1999-2008 The Apache Software Foundation
 
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
diff --git a/WHATSNEW b/WHATSNEW
index 4ab275eaa..5836e81c9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -53,9 +53,6 @@ Fixed bugs:
  * <touch> task couldn't differentiate between "no resources specified" and "no resources
    matched."  Bugzilla report 43799.
    
-   
-
-
 Other changes:
 --------------
 
@@ -206,6 +203,11 @@ Fixed bugs:
 * Regession nested macrodefs with elements could cause StackOverFlow.
   Bugzilla 43324.
 
+* Some changes to <junit> broke third party tasks that extend it (like
+  Apache Cactus' Ant task).  The changes have been modified so that
+  subclases should now work again - without any changes to the
+  subclass.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index eaeb4065c..507e87afa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -748,6 +748,10 @@ public class JUnitTask extends Task {
 
     /**
      * Sets up the delegate that will actually run the tests.
+     *
+     * <p>Will be invoked implicitly once the delegate is needed.</p>
+     *
+     * @since Ant 1.7.1
      */
     protected void setupJUnitDelegate() {
         ClassLoader myLoader = JUnitTask.class.getClassLoader();
@@ -1604,6 +1608,12 @@ public class JUnitTask extends Task {
 
     /**
      * Removes resources.
+     *
+     * <p>Is invoked in {@link #execute execute}.  Subclasses that
+     * don't invoke execute should invoke this method in a finally
+     * block.</p>
+     *
+     * @since Ant 1.7.1
      */
     protected void cleanup() {
         deleteClassLoader();
diff --git a/xdocs/legal.xml b/xdocs/legal.xml
index 3ec248439..ca3467723 100644
--- a/xdocs/legal.xml
+++ b/xdocs/legal.xml
@@ -26,7 +26,7 @@
     
     <section name="Legal Stuff They Make Us Say">
 
-      <p>All material on this website is Copyright &#169; 1999-2004,
+      <p>All material on this website is Copyright &#169; 1999-2008,
       The Apache Software Foundation.</p>
 
       <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web