--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,7 @@ Copyright 1997 - July 2008 CWI, August 2
 <!--
 
   Build file to allow ant (http://jakarta.apache.org/ant/) to be used
-  to build the MonetDB Java libraries, such as the JDBC and XML:DB
-  drivers.
+  to build the MonetDB Java packages, such as the JDBC driver.
 
 -->
 
@@ -42,7 +41,6 @@ Copyright 1997 - July 2008 CWI, August 2
     value="${jardir}/jmonetdb.jar" />
   <property name="mcl-jar"
     value="${jardir}/monetdb-mcl-${MCL_MAJOR}.${MCL_MINOR}.jar" />
-
   <property name="mero-control-jar"
     value="${jardir}/merocontrol.jar" />
 
@@ -64,9 +62,7 @@ Copyright 1997 - July 2008 CWI, August 2
   <!-- full target -->
   <target name="all">
     <antcall target="distjdbc" />
-
     <antcall target="distmerocontrol" />
-
     <antcall target="doc" />
   </target>
 
@@ -120,11 +116,11 @@ Copyright 1997 - July 2008 CWI, August 2
     </jar>
   </target>
 
-  <!-- a convenience jar of JDBC plus the JdbcClient utililty -->
+  <!-- a convenience jar of jdbcclient command line program plus JDBC driver -->
   <target name="jar_jdbcclient"
     depends="compile_mcl,compile_jdbc,compile_util,compile_client"
     unless="uptodate.jdbcclient-jar">
-    <echo message="Building JDBC + JdbcClient convenience jar" />
+    <echo message="Building jdbcclient + JDBC driver convenience jar" />
     <jar jarfile="${jdbcclient-jar}">
       <fileset dir="${builddir}">
         <include name="${jdbc-package}/**/*.class" />
@@ -258,8 +254,8 @@ Copyright 1997 - July 2008 CWI, August 2
   </target>
 
   <!--
-  This generates MonetDriver.java from its ".java.in" equivalents.  It's
-  required for importing the driver version properties.
+  This generates MonetDriver.java from its ".java.in" equivalent.
+  It's required for importing the driver version properties.
   -->
   <target name="driver" depends="prepare" unless="uptodate.drivers">
     <tstamp>
@@ -356,7 +352,7 @@ Copyright 1997 - July 2008 CWI, August 2
 
   <!-- documentation target -->
   <target name="doc"
-    depends="compile_mcl,compile_jdbc,compile_util,compile_client,compile_mero_control">
+    depends="driver">
     <javadoc
       destdir="${docdir}"
       author="true"
@@ -371,14 +367,6 @@ Copyright 1997 - July 2008 CWI, August 2
         <include name="${util-package}/**/*.java" />
         <include name="${mero-control-package}/**/*.java" />
       </fileset>
-
-      <fileset dir="${builddir}/src" defaultexcludes="yes">
-        <include name="${jdbc-package}/**/*.java" />
-        <include name="${mcl-package}/**/*.java" />
-        <include name="${client-package}/**/*.java" />
-        <include name="${util-package}/**/*.java" />
-        <include name="${mero-control-package}/**/*.java" />
-      </fileset>
     </javadoc>
   </target>