diff --git a/docs/antnews.html b/docs/antnews.html
index 12752944a..3665b9bb5 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -114,7 +114,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
@@ -176,6 +176,15 @@
   <div class="content">
     <h1 class="title">News</h1>
             <h3 class="section">
+      <a name="Wiki Migration"></a>
+      Wiki Migration
+    </h3>
+                        <h3>February 29, 2004</h3>
+                                <p>The Ant Wiki pages have been migrated to their 
+      <a href="http://wiki.apache.org/ant/">new home</a> on the Apache
+      Wiki farm.
+    </p>
+                        <h3 class="section">
       <a name="Ant 1.6.1"></a>
       Ant 1.6.1
     </h3>
@@ -209,7 +218,7 @@
     notes.</p>
                                 <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
-<a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
+<a href="http://wiki.apache.org/ant/NewAntFeaturesInDetail">Wiki</a>.</p>
                         <h3 class="section">
       <a name="Ant 1.5.4"></a>
       Ant 1.5.4
diff --git a/docs/bindownload.html b/docs/bindownload.html
index 24bfdebe1..a982712a3 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -106,7 +106,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/bylaws.html b/docs/bylaws.html
index 2bb2b0052..c9da1da37 100644
--- a/docs/bylaws.html
+++ b/docs/bylaws.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/contributors.html b/docs/contributors.html
index c6d75566d..801281766 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/cvs.html b/docs/cvs.html
index 41833f4ee..a70cf8a0f 100644
--- a/docs/cvs.html
+++ b/docs/cvs.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/external.html b/docs/external.html
index f88b35f52..4ad63d857 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/faq.html b/docs/faq.html
index 5ac305802..7a5d2f2ed 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -108,7 +108,7 @@
                               <span class="sel">Frequently Asked Questions</span>
                               </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/index.html b/docs/index.html
index 0efa3cc11..6214315c9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -110,7 +110,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/legal.html b/docs/legal.html
index 1d3d4b076..0dea4b521 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/license.html b/docs/license.html
index 731689821..256f59fd6 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/mail.html b/docs/mail.html
index bee7b74d8..67f4185d5 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/mission.html b/docs/mission.html
index 54d7e90f3..98bc3fa65 100644
--- a/docs/mission.html
+++ b/docs/mission.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/problems.html b/docs/problems.html
index 91f4daa21..565e01bf0 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                               <span class="sel">Having Problems?</span>
diff --git a/docs/projects.html b/docs/projects.html
index dee9cf43c..73d898c58 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/docs/resources.html b/docs/resources.html
index 3655216c2..a176d64b7 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -108,7 +108,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
@@ -246,7 +246,7 @@
         <a name="Apache"></a>
         Apache
       </h4>
-                        <p>The ASF provides a Wiki for several topics. </p>
+                        <p>The ASF provides a Wiki farm for Apache projects.</p>
                                       <table class="externals" cellspacing="1" cellpadding="4">
               <tr>
                       <th colspan="1" rowspan="1"
@@ -255,17 +255,17 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://nagoya.apache.org/wiki/apachewiki.cgi">http://nagoya.apache.org/wiki/apachewiki.cgi</a>
+          <a href="http://wiki.apache.org/general">Apache Wiki Farm</a>
       </td>
       </tr>
                   <tr>
                       <th colspan="1" rowspan="1"
       valign="top" align="left">
-          Ant main page:
+          Ant Wiki:
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages</a>
+          <a href="http://wiki.apache.org/ant/">Ant Wiki</a>
       </td>
       </tr>
         </table>
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index 625c33f03..d0340341b 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -106,7 +106,7 @@
                                     <a href="./faq.html">Frequently Asked Questions</a>
                                 </li>
                             <li>
-                                    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">Wiki</a>
+                                    <a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
                                 </li>
                             <li>
                                     <a href="./problems.html">Having Problems?</a>
diff --git a/xdocs/antnews.xml b/xdocs/antnews.xml
index fb80ed434..f146a7b7f 100644
--- a/xdocs/antnews.xml
+++ b/xdocs/antnews.xml
@@ -25,6 +25,14 @@
   </properties>
 
 <body>
+  <section name="Wiki Migration">
+    <h3>February 29, 2004</h3>
+    <p>The Ant Wiki pages have been migrated to their 
+      <a href="http://wiki.apache.org/ant/">new home</a> on the Apache
+      Wiki farm.
+    </p>
+  </section>
+
   <section name="Ant 1.6.1">
     <h3>February 12, 2004 - Ant 1.6.1 Available</h3>
     <p>Apache Ant 1.6.1 is now available for <a
@@ -57,7 +65,7 @@
     
     <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
-<a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
+<a href="http://wiki.apache.org/ant/NewAntFeaturesInDetail">Wiki</a>.</p>
 
    </section>
 
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index af9daa189..170e8ff08 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -70,16 +70,16 @@
     <section name="WIKIs">
       <subsection name="Apache">
 
-        <p>The ASF provides a Wiki for several topics. </p>
+        <p>The ASF provides a Wiki farm for Apache projects.</p>
 
         <table class="externals">
           <tr>
             <th>Main page:</th>
-            <td><a href="http://nagoya.apache.org/wiki/apachewiki.cgi">http://nagoya.apache.org/wiki/apachewiki.cgi</a></td>
+            <td><a href="http://wiki.apache.org/general">Apache Wiki Farm</a></td>
           </tr>
           <tr>
-            <th>Ant main page:</th>
-            <td><a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages">http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages</a></td>
+            <th>Ant Wiki:</th>
+            <td><a href="http://wiki.apache.org/ant/">Ant Wiki</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index df926a588..6a5ed42ea 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -39,7 +39,7 @@
                 <item name="Frequently Asked Questions"
                       href="/faq.html"/>
                 <item name="Wiki"
-                      href="http://nagoya.apache.org/wiki/apachewiki.cgi?AntProjectPages"/>
+                      href="http://wiki.apache.org/ant/FrontPage"/>
                 <item name="Having Problems?"
                       href="/problems.html"/>
             </menu>