diff --git a/docs/external.html b/docs/external.html
index d3acd70b0..dfb73576f 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -230,7 +230,7 @@
           </font>
         </td></tr>
       </table>
-                        <p><a href="http://aspectj.org">AspectJ</a> is an
+                        <p><a href="http://www.eclipse.org/aspectj/">AspectJ</a> is an
           aspect-oriented extension to Java.  This task compiles a
           source tree using the AspectJ compiler -- AJC.</p>
                                   <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -251,7 +251,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://aspectj.org/dl">http://aspectj.org/dl</a>
+          <a href="http://www.eclipse.org/aspectj/">http://www.eclipse.org/aspectj/</a>
       </td>
       </tr>
                   <tr>
@@ -261,7 +261,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="mailto:support@aspectj.org">support@aspectj.org</a>
+          <a href="http://www.eclipse.org/aspectj/">project mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -362,7 +362,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://aft.sourceforge.net">http://aft.sourceforge.net</a>
+          <a href="http://aft.sourceforge.net/">http://aft.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -586,7 +586,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.thecortex.net/clover">http://www.thecortex.net/clover</a>
+          <a href="http://www.thecortex.net/clover/">http://www.thecortex.net/clover/</a>
       </td>
       </tr>
                   <tr>
@@ -799,7 +799,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://ant-doxygen.sourceforge.net">http://ant-doxygen.sourceforge.net</a>
+          <a href="http://ant-doxygen.sourceforge.net/">http://ant-doxygen.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1264,7 +1264,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.smartkey.co.uk/antic.html">www.smartkey.co.uk</a>
+          <a href="http://www.smartkey.co.uk/antic.html">http://www.smartkey.co.uk/antic.html</a>
             
       </td>
       </tr>
@@ -1320,7 +1320,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://jacson.sourceforge.net">http://jacson.sourceforge.net</a>
+          <a href="http://jacson.sourceforge.net/">http://jacson.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1373,7 +1373,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://jalopy.sourceforge.net">http://jalopy.sourceforge.net</a>
+          <a href="http://jalopy.sourceforge.net/">http://jalopy.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -1505,7 +1505,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.java2html.de">http://www.java2html.de</a>
+          <a href="http://www.java2html.de/">http://www.java2html.de/</a>
       </td>
       </tr>
                   <tr>
@@ -2958,7 +2958,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.yworks.com/products/yguard">http://www.yworks.com/products/yguard</a>
+          <a href="http://www.yworks.com/en/products_yguard_about.htm">http://www.yworks.com/en/products_yguard_about.htm</a>
       </td>
       </tr>
                   <tr>
@@ -3232,7 +3232,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.dieter-bogdoll.de/java/AntRunner/">http://www.dieter-bogdoll.de/java/AntRunner/</a>
+          <a href="http://antrunner.sourceforge.net/">http://antrunner.sourceforge.net/</a>
       </td>
       </tr>
                   <tr>
@@ -3336,7 +3336,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.eclipse.org">http://www.eclipse.org</a>
+          <a href="http://www.eclipse.org/">http://www.eclipse.org/</a>
       </td>
       </tr>
                   <tr>
diff --git a/xdocs/external.xml b/xdocs/external.xml
index c75056a92..f265bcf10 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -25,7 +25,7 @@
     <section name="Tasks">
       <subsection name="AJC">
 
-        <p><a href="http://aspectj.org">AspectJ</a> is an
+        <p><a href="http://www.eclipse.org/aspectj/">AspectJ</a> is an
           aspect-oriented extension to Java.  This task compiles a
           source tree using the AspectJ compiler -- AJC.</p>
 
@@ -36,11 +36,11 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://aspectj.org/dl">http://aspectj.org/dl</a></td>
+            <td><a href="http://www.eclipse.org/aspectj/">http://www.eclipse.org/aspectj/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
-            <td><a href="mailto:support@aspectj.org">support@aspectj.org</a></td>
+            <td><a href="http://www.eclipse.org/aspectj/">project mailing lists</a></td>
           </tr>
           <tr>
             <th>License:</th>
@@ -90,7 +90,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://aft.sourceforge.net">http://aft.sourceforge.net</a></td>
+            <td><a href="http://aft.sourceforge.net/">http://aft.sourceforge.net/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -201,7 +201,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.thecortex.net/clover">http://www.thecortex.net/clover</a></td>
+            <td><a href="http://www.thecortex.net/clover/">http://www.thecortex.net/clover/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -309,7 +309,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://ant-doxygen.sourceforge.net">http://ant-doxygen.sourceforge.net</a></td>
+            <td><a href="http://ant-doxygen.sourceforge.net/">http://ant-doxygen.sourceforge.net/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -540,7 +540,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.smartkey.co.uk/antic.html">www.smartkey.co.uk</a>
+            <td><a href="http://www.smartkey.co.uk/antic.html">http://www.smartkey.co.uk/antic.html</a>
             </td>
           </tr>
           <tr>
@@ -569,7 +569,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://jacson.sourceforge.net">http://jacson.sourceforge.net</a></td>
+            <td><a href="http://jacson.sourceforge.net/">http://jacson.sourceforge.net/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -594,7 +594,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://jalopy.sourceforge.net">http://jalopy.sourceforge.net</a></td>
+            <td><a href="http://jalopy.sourceforge.net/">http://jalopy.sourceforge.net/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -671,7 +671,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.java2html.de">http://www.java2html.de</a></td>
+            <td><a href="http://www.java2html.de/">http://www.java2html.de/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -1406,7 +1406,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.yworks.com/products/yguard">http://www.yworks.com/products/yguard</a></td>
+            <td><a href="http://www.yworks.com/en/products_yguard_about.htm">http://www.yworks.com/en/products_yguard_about.htm</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -1540,7 +1540,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.dieter-bogdoll.de/java/AntRunner/">http://www.dieter-bogdoll.de/java/AntRunner/</a></td>
+            <td><a href="http://antrunner.sourceforge.net/">http://antrunner.sourceforge.net/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>
@@ -1588,7 +1588,7 @@
           </tr>
           <tr>
             <th>URL:</th>
-            <td><a href="http://www.eclipse.org">http://www.eclipse.org</a></td>
+            <td><a href="http://www.eclipse.org/">http://www.eclipse.org/</a></td>
           </tr>
           <tr>
             <th>Contact:</th>