diff --git a/docs.xml b/docs.xml
index bcaf48fad..a6f94f83d 100644
--- a/docs.xml
+++ b/docs.xml
@@ -59,6 +59,9 @@
                    property="AnakiaTask.present">
             <classpath refid="anakia.classpath"/>
         </available>
+        <condition property="onwindows">
+            <os family="windows"/>
+        </condition>
     </target>
 
     <target depends="prepare" name="prepare-error" unless="AnakiaTask.present">
@@ -68,7 +71,7 @@
         </echo>
     </target>
 
-    <target name="docs" if="AnakiaTask.present" depends="prepare-error" description="Create XDocs.">
+    <target name="anakia" if="AnakiaTask.present" depends="prepare-error">
         <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
             <classpath refid="anakia.classpath"/>
         </taskdef>
@@ -84,6 +87,12 @@
         </anakia>
     </target>
 
+    <target name="fixcrlf" if="onwindows">
+        <fixcrlf srcDir="${docs.dest}" eol="dos" includes="*.html"/>
+    </target>
+
+    <target name="docs" if="AnakiaTask.present" depends="anakia,fixcrlf" description="Create XDocs.">
+    </target>
     <target name="javadocs" description="Create Javadoc.">
       <ant antfile="build.xml" target="dist_javadocs">
         <property name="dist.javadocs" value="${docs.dest}/manual/api" />
diff --git a/docs/svn.html b/docs/svn.html
index 6ba0b41f4..bdc754256 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -186,7 +186,9 @@
 svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</pre>
                                 <p>Modules available for access are:</p>
                                 <ul>
-        <li>ant - The "main" Ant module.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The "main" Ant module.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
       </ul>
                                 <p>If you are not familiar with Subversion, <a href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
       source repositories page</a> may hold many helpful hints.</p>
diff --git a/xdocs/svn.xml b/xdocs/svn.xml
index b248ad731..a433bd60c 100644
--- a/xdocs/svn.xml
+++ b/xdocs/svn.xml
@@ -35,7 +35,9 @@ svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</sourc
       <p>Modules available for access are:</p>
 
       <ul>
-        <li>ant - The &quot;main&quot; Ant module.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The &quot;main&quot; Ant module.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
+        <li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
       </ul>
 
       <p>If you are not familiar with Subversion, <a