--- build.xml.orig	2009-09-28 06:24:43.000000000 -0500
+++ build.xml	2009-10-04 12:52:47.000000000 -0500
@@ -196,27 +196,15 @@
 
 	<target name="javadoc" depends="library">
 		<mkdir dir="build/javadoc"/>
-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
-			overview="overview.html">
+		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
 			
-            <classpath>
-                <fileset dir="lib/integration">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-
-			<packageset dir="hamcrest-core/src/main/java"/>
 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
-			<packageset dir="hamcrest-integration/src/main/java"/>
-			<packageset dir="build/generated-code"/>
+			<packageset dir="build/temp/hamcrest-library/generated-code"/>
 			
 			<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://java.sun.com/j2se/1.5.0/docs/api/"/>
-			<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
-			<link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
 		</javadoc>
 	</target>