diff --git a/docs/external.html b/docs/external.html
index a465868aa..fa8c8d572 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -1046,6 +1046,80 @@
         </table>
                     </blockquote>
     </td></tr>
+  </table>
+                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="Tidy Imports (Tim)"><strong>Tidy Imports (Tim)</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                        <p>Tim is a handy utility that can be executed on the command
+        line or via Ant that automatically formats your import
+        declarations. Tim is capable of removing unused imports,
+        expanding or collapsing imports and even organising them into
+        pre-determined groups.</p>
+                                  <table>
+              <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Compatibility:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Ant 1.3 and later
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          URL:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://www.chive.com/tim.htm">http://www.chive.com/tim.htm</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Contact:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="mailto:support@chive.com">support@chive.com</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          License:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Commercial
+        </font>
+  </td>
+      </tr>
+        </table>
+                    </blockquote>
+    </td></tr>
   </table>
                                   <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#828DA6">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
index 6ab9dfa44..ad4d65fe7 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/xdocs/external.xml b/xdocs/external.xml
index 8671ed4e9..5c988cebc 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -369,6 +369,34 @@
         </table>
       </subsection>
 
+      <subsection name="Tidy Imports (Tim)">
+
+        <p>Tim is a handy utility that can be executed on the command
+        line or via Ant that automatically formats your import
+        declarations. Tim is capable of removing unused imports,
+        expanding or collapsing imports and even organising them into
+        pre-determined groups.</p>
+        
+        <table>
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.3 and later</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://www.chive.com/tim.htm">http://www.chive.com/tim.htm</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td><a href="mailto:support@chive.com">support@chive.com</a></td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>Commercial</td>
+          </tr>
+        </table>
+      </subsection>
+
       <subsection name="TiniAnt">
 
         <p>TiniAnt is an Ant task to support building applications for