diff --git a/build.xml b/build.xml
index 99669d7..b8d903c 100644
--- a/build.xml
+++ b/build.xml
@@ -38,10 +38,11 @@ just creates a distribution out of all of them.
   <!-- Overall distribution unit -->
   <property name="dist.basename" value="xml-commons-${version}"/> 
   <property name="dist.dir" value="${tmp.dir}/build"/>
+  <property name="site.dir" value="${dist.dir}/site"/>
 
   <!-- Public Targets -->
   <target name="all"
-          depends="docs,jars,dist"
+          depends="site,jars,javadocs,dist"
           description="Default all target; calls every sub-build file directly.">
   </target>
 
@@ -71,9 +72,6 @@ just creates a distribution out of all of them.
       <fileset dir="java/"/>
     </copy>  
 
-    <!-- Copy the documentation that has already been built by Forrest -->
-    <!-- No need, because forrest builds directly into ${dist.dir}/site/ -->
-
     <!-- Copy pertinent top-level files -->
     <copy todir="${dist.dir}/${dist.basename}">
       <fileset dir="." includes="KEYS,README.html,build.xml"/>
@@ -105,13 +103,11 @@ just creates a distribution out of all of them.
     </ant>
   </target>
 
-  <target name="docs">
-    <!-- call forrest to prepare the docs -->
-    <ant target="site" />
-
+  <target name="javadocs">
     <!-- copy the various javadocs into the website docs -->
-<!-- FIXME: not yet done -->
-
+    <copy todir="${site.dir}/components/apidocs">
+      <fileset dir="java/build/apidocs"/>
+    </copy>  
   </target>
   
   <!-- import the Forrest build targets -->
diff --git a/java/resolver.xml b/java/resolver.xml
index 75603fa..a7c8b39 100644
--- a/java/resolver.xml
+++ b/java/resolver.xml
@@ -27,7 +27,7 @@ Build file for org.apache.xml.resolver. No dependencies.
   <property name="build.etc.dir" value="${build.classes.dir}/org/apache/xml/resolver/etc"/>
   <property name="docs.dir" value="${build.dir}"/>
   <property name="docs.user.dir" value="${docs.dir}/docs"/>
-  <property name="docs.java.dir" value="${docs.user.dir}/apidocs"/>
+  <property name="docs.java.dir" value="${docs.dir}/apidocs/resolver"/>
   <property name="docs.site.dir" value="../build/site"/>
   <property name="dist.basename" value="${name.resolver}-${impl.version}"/> 
 
@@ -151,6 +151,9 @@ Build file for org.apache.xml.resolver. No dependencies.
 
   <target name="htmldocs" depends="jar">
     <echo message="Building docs for ${name.resolver} ..." />
+<!-- Note: The docs are built in two ways until we stabilise the doc generation.
+Both ways have system-specific pathnames, so both may bust on your system.
+-->
     <java fork="true" classname="org.apache.xalan.xslt.Process">
       <classpath>
 	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xml-apis.jar"/>
@@ -190,11 +193,12 @@ Build file for org.apache.xml.resolver. No dependencies.
       <arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
     </java>
 
-    <!-- Copy the docs that forrest built -->
+    <!-- Copy the docs that Forrest built.
+     The top-level build has already executed the forrest site target. -->
     <copy todir="${build.dir}/docs">
       <fileset dir="${docs.site.dir}/components/resolver"
                includes="resolver-*.html"/>
-    </copy>  
+    </copy>
     
   </target>
 
@@ -213,7 +217,10 @@ Build file for org.apache.xml.resolver. No dependencies.
     <!-- Copy docs/javadocs -->
     <copy todir="${build.dir}/${dist.basename}/docs">
       <fileset dir="${docs.user.dir}"/>
-    </copy>  
+    </copy>
+    <copy todir="${build.dir}/${dist.basename}/apidocs/resolver">
+      <fileset dir="${docs.java.dir}"/>
+    </copy>
 
     <!-- Copy pertinent top-level files and the .jar -->
     <copy todir="${build.dir}/${dist.basename}">
diff --git a/java/which.xml b/java/which.xml
index 813f848..3b96f20 100644
--- a/java/which.xml
+++ b/java/which.xml
@@ -27,7 +27,7 @@ Build file for org.apache.env.Which service. No dependencies.
   <property name="build.classes.dir" value="${build.dir}/classes"/>
   <property name="docs.dir" value="${build.dir}"/>
   <property name="docs.user.dir" value="${docs.dir}/docs"/>
-  <property name="docs.java.dir" value="${docs.user.dir}/javadocs"/>
+  <property name="docs.java.dir" value="${docs.dir}/apidocs/which"/>
   <property name="docs.printer.dir" value="${docs.user.dir}/printer"/>
   
   <!-- Source constants and directories -->