diff --git a/docs/bindownload.html b/docs/bindownload.html
index 2b06fa198..af5c8c74d 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -267,6 +267,13 @@ Other mirrors: <select name="Preferred">
 [<a href="http://www.apache.org/dist/ant/binaries/jakarta-ant-1.5.1-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
                       <br/>
+  <table class="nowrap" border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#294563"><font color="#ffffff"><a name="Nightly Builds"><strong>Nightly Builds</strong></a></font></td></tr>
+  </table>
+                        <p>If you wish to use the latest Ant features, you can try downloading a
+<a href="http://cvs.apache.org/builds/ant/nightly/">nightly build</a>.
+</p>
+                      <br/>
   <table class="nowrap" border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#294563"><font color="#ffffff"><a name="Old Ant Releases"><strong>Old Ant Releases</strong></a></font></td></tr>
   </table>
diff --git a/docs/cvs.html b/docs/cvs.html
index 52041c984..e24e53caa 100644
--- a/docs/cvs.html
+++ b/docs/cvs.html
@@ -226,7 +226,10 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout [module-name]</p
       </ul>
                                 <p>If you are not familiar with CVS, <a href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
       CVS page</a> may hold many helpful hints.</p>
-                                <p>Nightly snapshots of the CVS tree are available at <a href="http://cvs.apache.org/snapshots/jakarta-ant/">http://cvs.apache.org/snapshots/jakarta-ant/</a>.</p>
+                                <p>Nightly snapshots of the CVS tree are available at 
+        <a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a> 
+        and 
+        <a href="http://cvs.apache.org/snapshots/ant-antidote/">http://cvs.apache.org/snapshots/ant-antidote/</a>.</p>
                 
   
                     </div>
diff --git a/docs/faq.html b/docs/faq.html
index 2cf62c6cb..d8d04fce6 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -674,7 +674,7 @@
           </font>
         </td></tr>
       </table>
-                  <p>Join and post a message to the ant-dev or ant-user mailing
+                  <p>Join and post a message to the dev or user mailing
         list (one list is enough), including the following
         information:</p>
                         <ul>
diff --git a/docs/index.html b/docs/index.html
index c90c82fa3..ca17910f5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -280,10 +280,7 @@ Comprehensive documentation is included in the source and binary distributions.
   </table>
                         <p>
     If you wish to use the latest Ant features, you can try downloading a nightly 
-<!--
     build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
--->
-    build from <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">here</a>
     </p>
                       <br/>
   <table class="nowrap" border="0" cellspacing="0" cellpadding="2" width="100%">
diff --git a/docs/mail.html b/docs/mail.html
index 4c160d9a2..9d2eb1ded 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -231,7 +231,7 @@
           <b>Medium Traffic</b> 
           <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
-          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=user@ant.apache.org">Archive</a> 
         </p>
                                 <p>This list is for developers that are using Ant in their own
         projects to ask questions, share knowledge, and discuss issues
@@ -249,7 +249,7 @@
           <b>High Traffic</b> 
           <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
-          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=dev@ant.apache.org">Archive</a> 
         </p>
                                 <p>This is the list where participating developers of the Ant
         build tool meet and discuss issues, code changes/additions,
diff --git a/docs/problems.html b/docs/problems.html
index 425a22f37..10da71ea0 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -356,12 +356,8 @@ D:\src\java\Unset.java<br />
             been fixed. The next step, therefore, may be to try a nightly build
             of Ant to see if the problem has been fixed. Nightly builds for Ant
             are available from the 
-<!--
             <a href="http://cvs.apache.org/builds/ant/nightly/">
             Ant web site</a>. While Ant nightly builds are typically quite
--->
-            <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">
-            Ant web site</a>. While Ant nightly builds are typically quite
             stable and are used by
             <a href="http://cvs.apache.org/builds/gump/latest/">Gump</a>
             to build many other Jakarta projects, these builds should
@@ -369,12 +365,8 @@ D:\src\java\Unset.java<br />
             do not build many of the optional tasks the come with Ant.
             A snapshot of these optional tasks is occasionally uploaded to
             the nightly download
-<!--
             <a href="http://cvs.apache.org/builds/ant/nightly/optional/">
             area</a>. However, even this snapshot does not contain every
--->
-            <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/optional/">
-            area</a>. However, even this snapshot does not contain every
             optional task.
         </p>
                                                     <br/>
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index 2a94d7d42..2cd694f23 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -266,6 +266,13 @@ Other mirrors: <select name="Preferred">
 [<a href="http://www.apache.org/dist/ant/source/jakarta-ant-1.5.1-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
                       <br/>
+  <table class="nowrap" border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#294563"><font color="#ffffff"><a name="Nightly Builds"><strong>Nightly Builds</strong></a></font></td></tr>
+  </table>
+                        <p>If you wish to use the latest Ant features, you can try downloading a
+<a href="http://cvs.apache.org/builds/ant/nightly/">nightly build</a>.
+</p>
+                      <br/>
   <table class="nowrap" border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#294563"><font color="#ffffff"><a name="Old Ant Releases"><strong>Old Ant Releases</strong></a></font></td></tr>
   </table>
diff --git a/xdocs/bindownload.xml b/xdocs/bindownload.xml
index fce4c2a6b..8e729904a 100644
--- a/xdocs/bindownload.xml
+++ b/xdocs/bindownload.xml
@@ -79,7 +79,6 @@ Other mirrors: <select name="Preferred">
 </ul>
 </section>
 
-<!--
 <section name="Nightly Builds">
 
 <p>If you wish to use the latest Ant features, you can try downloading a
@@ -87,7 +86,7 @@ Other mirrors: <select name="Preferred">
 </p>
 
 </section>
--->
+
 <section name="Old Ant Releases">
 
 <p>Older releases of Ant can be found <a
diff --git a/xdocs/cvs.xml b/xdocs/cvs.xml
index 301931321..7b6d2f4fc 100644
--- a/xdocs/cvs.xml
+++ b/xdocs/cvs.xml
@@ -36,10 +36,11 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout [module-name]</s
       href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
       CVS page</a> may hold many helpful hints.</p>
 
-<!--
-      <p>Nightly snapshots of the CVS tree are available at <a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
--->
-      <p>Nightly snapshots of the CVS tree are available at <a href="http://cvs.apache.org/snapshots/jakarta-ant/">http://cvs.apache.org/snapshots/jakarta-ant/</a>.</p>
+      <p>Nightly snapshots of the CVS tree are available at 
+        <a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a> 
+        and 
+        <a href="http://cvs.apache.org/snapshots/ant-antidote/">http://cvs.apache.org/snapshots/ant-antidote/</a>.</p>
+
   </section>
   </body>
 </document>
\ No newline at end of file
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index f8716bd0e..060094e00 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -188,8 +188,7 @@
       page &quot;External Tools and Task&quot;?</question>
       <answer>
 
-<!--        <p>Join and post a message to the dev or user mailing-->
-        <p>Join and post a message to the ant-dev or ant-user mailing
+        <p>Join and post a message to the dev or user mailing
         list (one list is enough), including the following
         information:</p>
 
diff --git a/xdocs/index.xml b/xdocs/index.xml
index a98f70895..f90efc101 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -86,10 +86,7 @@ Comprehensive documentation is included in the source and binary distributions.
   <section name="Nightly Builds">
     <p>
     If you wish to use the latest Ant features, you can try downloading a nightly 
-<!--
     build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
--->
-    build from <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">here</a>
     </p>
     
   </section>
diff --git a/xdocs/mail.xml b/xdocs/mail.xml
index 53cc3e7af..37c048df5 100644
--- a/xdocs/mail.xml
+++ b/xdocs/mail.xml
@@ -29,7 +29,7 @@
           <b>Medium Traffic</b> 
           <a href="mailto:user-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:user-unsubscribe@ant.apache.org">Unsubscribe</a> 
-          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-user@jakarta.apache.org">Archive</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=user@ant.apache.org">Archive</a> 
         </p>
 
         <p>This list is for developers that are using Ant in their own
@@ -42,7 +42,7 @@
           <b>High Traffic</b> 
           <a href="mailto:dev-subscribe@ant.apache.org">Subscribe</a>  
           <a href="mailto:dev-unsubscribe@ant.apache.org">Unsubscribe</a> 
-          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=ant-dev@jakarta.apache.org">Archive</a> 
+          <a href="http://archives.apache.org/eyebrowse/SummarizeList?listName=dev@ant.apache.org">Archive</a> 
         </p>
 
         <p>This is the list where participating developers of the Ant
diff --git a/xdocs/problems.xml b/xdocs/problems.xml
index 40e580f84..2d0c4f18d 100644
--- a/xdocs/problems.xml
+++ b/xdocs/problems.xml
@@ -130,12 +130,8 @@ D:\src\java\Unset.java<br></br>
             been fixed. The next step, therefore, may be to try a nightly build
             of Ant to see if the problem has been fixed. Nightly builds for Ant
             are available from the 
-<!--
             <a href="http://cvs.apache.org/builds/ant/nightly/">
             Ant web site</a>. While Ant nightly builds are typically quite
--->
-            <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/">
-            Ant web site</a>. While Ant nightly builds are typically quite
             stable and are used by
             <a href="http://cvs.apache.org/builds/gump/latest/">Gump</a>
             to build many other Jakarta projects, these builds should
@@ -143,12 +139,8 @@ D:\src\java\Unset.java<br></br>
             do not build many of the optional tasks the come with Ant.
             A snapshot of these optional tasks is occasionally uploaded to
             the nightly download
-<!--
             <a href="http://cvs.apache.org/builds/ant/nightly/optional/">
             area</a>. However, even this snapshot does not contain every
--->
-            <a href="http://cvs.apache.org/builds/jakarta-ant/nightly/optional/">
-            area</a>. However, even this snapshot does not contain every
             optional task.
         </p>
       </subsection>
diff --git a/xdocs/srcdownload.xml b/xdocs/srcdownload.xml
index e75194cb7..96a334747 100644
--- a/xdocs/srcdownload.xml
+++ b/xdocs/srcdownload.xml
@@ -75,7 +75,6 @@ Other mirrors: <select name="Preferred">
 </ul>
 </section>
 
-<!--
 <section name="Nightly Builds">
 
 <p>If you wish to use the latest Ant features, you can try downloading a
@@ -83,7 +82,7 @@ Other mirrors: <select name="Preferred">
 </p>
 
 </section>
--->
+
 <section name="Old Ant Releases">
 
 <p>Older releases of Ant can be found <a