diff --git a/build.xml b/build.xml
index 1cfd4fb..5a7c740 100644
--- a/build.xml
+++ b/build.xml
@@ -14,13 +14,13 @@
     <target name="generator" description="Build code generator tool">
         <java-to-jar srcdir="hamcrest-generator/src/main/java"
                      modulename="hamcrest-generator-nodeps"
-                     classpath="lib/generator/qdox-1.12.jar"/>
+                     classpath="lib/generator/qdox.jar"/>
 
         <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
             <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-            <zipfileset src="lib/generator/qdox-1.12.jar"/>
+            <zipfileset src="lib/generator/qdox.jar"/>
             <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
         </jarjar>
         <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
@@ -152,7 +152,8 @@
 
         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
-                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
+                 windowtitle="Hamcrest" source="1.6" failonerror="yes">
+            <arg value="-Xdoclint:none"/>
             <classpath>
                 <fileset dir="lib/integration">
                     <include name="*.jar"/>
@@ -313,6 +314,7 @@
             <javadoc packagenames="org.hamcrest.*" sourcepath="build/temp/@{modulename}-${version}-sources.jar.contents" defaultexcludes="yes"
                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"
                      windowtitle="Hamcrest" source="1.6" failonerror="yes">
+                <arg value="-Xdoclint:none"/>
                 <classpath>
                     <fileset dir="lib/integration">
                         <include name="*.jar"/>