diff --git a/docs/ant15_todo.html b/docs/ant15_todo.html
index be5213326..1fdd73614 100644
--- a/docs/ant15_todo.html
+++ b/docs/ant15_todo.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Erik Hatcher">
   <meta name="email" value="ehatcher@apache.org">
         
+      
       <title>Apache Ant - Ant 1.5 Release To-Do List</title>
     </head>
   
diff --git a/docs/antnews.html b/docs/antnews.html
index e486de336..94d939d44 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -16,6 +16,7 @@
                 <meta name="author" value="Magesh Umasankar">
   <meta name="email" value="">
         
+      
       <title>Apache Ant - Ant News</title>
     </head>
   
diff --git a/docs/bindownload.html b/docs/bindownload.html
index 1b78b9fef..bed970ca2 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -10,6 +10,8 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+                        <base href="http://jakarta.apache.org/ant/."/>
+              
       <title>Apache Ant - Downloading Ant - Binary Distribution</title>
     </head>
   
diff --git a/docs/external.html b/docs/external.html
index 2956f060e..0e292c5ff 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - External Tools and Tasks</title>
     </head>
   
diff --git a/docs/faq.html b/docs/faq.html
index 31116bdd5..a639f5643 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Frequently Asked Questions</title>
     </head>
   
diff --git a/docs/index.html b/docs/index.html
index af94dc1d7..2db0d4622 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,6 +14,7 @@
                 <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="stefan.bodewig@epost.de">
         
+      
       <title>Apache Ant - Ant</title>
     </head>
   
diff --git a/docs/problems.html b/docs/problems.html
index c9ee63660..630073b47 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Conor MacNeill">
   <meta name="email" value="">
         
+      
       <title>Apache Ant - Having Problems?</title>
     </head>
   
diff --git a/docs/projects.html b/docs/projects.html
index cb5ed28a3..fc3ccec54 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Related Projects</title>
     </head>
   
diff --git a/docs/resources.html b/docs/resources.html
index 38a3f7cc8..bec1f8576 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Resources</title>
     </head>
   
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index 67e3cbde2..973920117 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -10,6 +10,8 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+                        <base href="http://jakarta.apache.org/ant/."/>
+              
       <title>Apache Ant - Downloading Ant - Source Distribution</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/ant15_todo.html b/proposal/ant-site/anakia/docs/ant15_todo.html
index f1a98a728..026064115 100644
--- a/proposal/ant-site/anakia/docs/ant15_todo.html
+++ b/proposal/ant-site/anakia/docs/ant15_todo.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Erik Hatcher">
   <meta name="email" value="ehatcher@apache.org">
         
+      
       <title>Apache Ant - Ant 1.5 Release To-Do List</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/antnews.html b/proposal/ant-site/anakia/docs/antnews.html
index 06dac3ab6..3db9a96d8 100644
--- a/proposal/ant-site/anakia/docs/antnews.html
+++ b/proposal/ant-site/anakia/docs/antnews.html
@@ -16,6 +16,7 @@
                 <meta name="author" value="Magesh Umasankar">
   <meta name="email" value="">
         
+      
       <title>Apache Ant - Ant News</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/bindownload.html b/proposal/ant-site/anakia/docs/bindownload.html
index f9de1c281..23a991982 100644
--- a/proposal/ant-site/anakia/docs/bindownload.html
+++ b/proposal/ant-site/anakia/docs/bindownload.html
@@ -10,6 +10,8 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+                        <base href="http://ant.apache.org/."/>
+              
       <title>Apache Ant - Downloading Ant - Binary Distribution</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/bylaws.html b/proposal/ant-site/anakia/docs/bylaws.html
index f528bafdf..3ddf51aef 100644
--- a/proposal/ant-site/anakia/docs/bylaws.html
+++ b/proposal/ant-site/anakia/docs/bylaws.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - Apache Ant Project Bylaws</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/contributors.html b/proposal/ant-site/anakia/docs/contributors.html
index e34d3606f..c97acf508 100644
--- a/proposal/ant-site/anakia/docs/contributors.html
+++ b/proposal/ant-site/anakia/docs/contributors.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - Contributors</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/cvs.html b/proposal/ant-site/anakia/docs/cvs.html
index b1799eb62..fc35acdef 100644
--- a/proposal/ant-site/anakia/docs/cvs.html
+++ b/proposal/ant-site/anakia/docs/cvs.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - CVS Repository</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/external.html b/proposal/ant-site/anakia/docs/external.html
index c122da75b..e3cc7ae50 100644
--- a/proposal/ant-site/anakia/docs/external.html
+++ b/proposal/ant-site/anakia/docs/external.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - External Tools and Tasks</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/faq.html b/proposal/ant-site/anakia/docs/faq.html
index 271c09593..c53e91139 100644
--- a/proposal/ant-site/anakia/docs/faq.html
+++ b/proposal/ant-site/anakia/docs/faq.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Frequently Asked Questions</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/guidelines.html b/proposal/ant-site/anakia/docs/guidelines.html
index cc20ca686..29ebf91cb 100644
--- a/proposal/ant-site/anakia/docs/guidelines.html
+++ b/proposal/ant-site/anakia/docs/guidelines.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - Project Guidelines</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/index.html b/proposal/ant-site/anakia/docs/index.html
index 392ce909c..17d6d9d9d 100644
--- a/proposal/ant-site/anakia/docs/index.html
+++ b/proposal/ant-site/anakia/docs/index.html
@@ -14,6 +14,7 @@
                 <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="stefan.bodewig@epost.de">
         
+      
       <title>Apache Ant - Ant</title>
     </head>
   
@@ -98,9 +99,8 @@
     <tr><td>
       <blockquote>
                         <h3>Apache Ant 1.5.1 Released!</h3>
-                                <p>Version 1.5.1 of Ant has been released. It is available for download 
-      <a href="http://www.apache.org/dist/ant/">here</a>.
-    </p>
+                                <p>Version 1.5.1 of Ant has been released. It is available for
+    download as <a href="bindownload.cgi">binary</a> or as <a href="srcdownload.cgi">source</a> distribution.</p>
                     </blockquote>
     </td></tr>
   </table>
diff --git a/proposal/ant-site/anakia/docs/legal.html b/proposal/ant-site/anakia/docs/legal.html
index 06af20f94..d8c54ec68 100644
--- a/proposal/ant-site/anakia/docs/legal.html
+++ b/proposal/ant-site/anakia/docs/legal.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Jon S. Stevens">
   <meta name="email" value="jon@latchkey.com">
         
+      
       <title>Apache Ant - Legal Stuff They Make Us Say</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/mail.html b/proposal/ant-site/anakia/docs/mail.html
index 90d0326ca..e5f00ae27 100644
--- a/proposal/ant-site/anakia/docs/mail.html
+++ b/proposal/ant-site/anakia/docs/mail.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - Mailing Lists</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/mission.html b/proposal/ant-site/anakia/docs/mission.html
index e5ff57d45..7b4f4ae30 100644
--- a/proposal/ant-site/anakia/docs/mission.html
+++ b/proposal/ant-site/anakia/docs/mission.html
@@ -10,6 +10,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+      
       <title>Apache Ant - Apache Ant Mission</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/problems.html b/proposal/ant-site/anakia/docs/problems.html
index 855452cc5..0eb229757 100644
--- a/proposal/ant-site/anakia/docs/problems.html
+++ b/proposal/ant-site/anakia/docs/problems.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Conor MacNeill">
   <meta name="email" value="">
         
+      
       <title>Apache Ant - Having Problems?</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/projects.html b/proposal/ant-site/anakia/docs/projects.html
index 76acab374..76e9e2042 100644
--- a/proposal/ant-site/anakia/docs/projects.html
+++ b/proposal/ant-site/anakia/docs/projects.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Related Projects</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/resources.html b/proposal/ant-site/anakia/docs/resources.html
index e0463d62a..d952151da 100644
--- a/proposal/ant-site/anakia/docs/resources.html
+++ b/proposal/ant-site/anakia/docs/resources.html
@@ -12,6 +12,7 @@
                       <meta name="author" value="Stefan Bodewig">
   <meta name="email" value="bodewig@apache.org">
         
+      
       <title>Apache Ant - Resources</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/docs/srcdownload.html b/proposal/ant-site/anakia/docs/srcdownload.html
index 780b687e7..89aec30ae 100644
--- a/proposal/ant-site/anakia/docs/srcdownload.html
+++ b/proposal/ant-site/anakia/docs/srcdownload.html
@@ -10,6 +10,8 @@
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
   
               
+                        <base href="http://ant.apache.org/."/>
+              
       <title>Apache Ant - Downloading Ant - Source Distribution</title>
     </head>
   
diff --git a/proposal/ant-site/anakia/xdocs/bindownload.xml b/proposal/ant-site/anakia/xdocs/bindownload.xml
index f3cde98cd..c459c69d6 100644
--- a/proposal/ant-site/anakia/xdocs/bindownload.xml
+++ b/proposal/ant-site/anakia/xdocs/bindownload.xml
@@ -3,6 +3,7 @@
 
   <properties>
     <title>Downloading Ant - Binary Distribution</title>
+    <base/>
   </properties>
 
 <body>
diff --git a/proposal/ant-site/anakia/xdocs/index.xml b/proposal/ant-site/anakia/xdocs/index.xml
index f4ae509df..9d48dd1e8 100644
--- a/proposal/ant-site/anakia/xdocs/index.xml
+++ b/proposal/ant-site/anakia/xdocs/index.xml
@@ -11,9 +11,10 @@
 
   <section name="Ant 1.5.1">
     <h3>Apache Ant 1.5.1 Released!</h3>
-    <p>Version 1.5.1 of Ant has been released. It is available for download 
-      <a href="http://www.apache.org/dist/ant/">here</a>.
-    </p>
+
+    <p>Version 1.5.1 of Ant has been released. It is available for
+    download as <a href="bindownload.cgi">binary</a> or as <a
+    href="srcdownload.cgi">source</a> distribution.</p>
   </section>
 
   <section name="Apache Ant">
diff --git a/proposal/ant-site/anakia/xdocs/srcdownload.xml b/proposal/ant-site/anakia/xdocs/srcdownload.xml
index cc507eeb5..bba369a5c 100644
--- a/proposal/ant-site/anakia/xdocs/srcdownload.xml
+++ b/proposal/ant-site/anakia/xdocs/srcdownload.xml
@@ -3,6 +3,7 @@
 
   <properties>
     <title>Downloading Ant - Source Distribution</title>
+    <base/>
   </properties>
 
 <body>
diff --git a/proposal/ant-site/anakia/xdocs/stylesheets/templates.vm b/proposal/ant-site/anakia/xdocs/stylesheets/templates.vm
index 524b10288..b0704d728 100644
--- a/proposal/ant-site/anakia/xdocs/stylesheets/templates.vm
+++ b/proposal/ant-site/anakia/xdocs/stylesheets/templates.vm
@@ -144,6 +144,15 @@
         #metaauthor ( $au.getText() $au.getAttributeValue("email") )
       #end
   
+      #if ($root.getChild("properties").getChild("base"))
+        #set ($url = $root.getChild("properties").getChild("base").getAttributeValue("href"))
+        #if ($url)
+          <base href="$url"/>
+        #else
+          <base href="$project.getAttributeValue("href")$relativePath"/>
+        #end
+      #end 
+
       <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
     </head>
   
diff --git a/xdocs/bindownload.xml b/xdocs/bindownload.xml
index f3cde98cd..c459c69d6 100644
--- a/xdocs/bindownload.xml
+++ b/xdocs/bindownload.xml
@@ -3,6 +3,7 @@
 
   <properties>
     <title>Downloading Ant - Binary Distribution</title>
+    <base/>
   </properties>
 
 <body>
diff --git a/xdocs/srcdownload.xml b/xdocs/srcdownload.xml
index cc507eeb5..bba369a5c 100644
--- a/xdocs/srcdownload.xml
+++ b/xdocs/srcdownload.xml
@@ -3,6 +3,7 @@
 
   <properties>
     <title>Downloading Ant - Source Distribution</title>
+    <base/>
   </properties>
 
 <body>
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index db4d5e39f..a0b0af1f1 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -155,6 +155,15 @@
         #metaauthor ( $au.getText() $au.getAttributeValue("email") )
       #end
   
+      #if ($root.getChild("properties").getChild("base"))
+        #set ($url = $root.getChild("properties").getChild("base").getAttributeValue("href"))
+        #if ($url)
+          <base href="$url"/>
+        #else
+          <base href="$project.getAttributeValue("href")$relativePath"/>
+        #end
+      #end 
+
       <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
     </head>