--- a/build.xml	2013-06-15 22:29:44.445548674 +0200
++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
@@ -132,30 +132,15 @@
     </target>
 
     <target name="javadoc" description="build javadoc jars">
-        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
         <java-to-javadoc-jar modulename="hamcrest-core"/>
-        <java-to-javadoc-jar modulename="hamcrest-library"/>
-        <java-to-javadoc-jar modulename="hamcrest-integration"/>
-        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
 
         <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">
-            <classpath>
-                <fileset dir="lib/integration">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
-            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>
-            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>
             
             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
             <group title="Matcher Library" packages="org.hamcrest.*"/>
-            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
-            
-            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
         </javadoc>
         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
@@ -302,14 +287,7 @@
                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"
                      windowtitle="Hamcrest" source="1.6" failonerror="yes">
                 <classpath>
-                    <fileset dir="lib/integration">
-                        <include name="*.jar"/>
-                    </fileset>
-                    <fileset file="lib/generator/qdox-1.12.jar"/>
                     <fileset file="build/hamcrest-core-${version}.jar"/>
-                    <fileset file="build/hamcrest-library-${version}.jar"/>
-                    <fileset file="build/hamcrest-generator-${version}.jar"/>
-                    <fileset file="build/hamcrest-integration-${version}.jar"/>
                 </classpath>
             </javadoc>
             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">