diff -Nru lucene-3.6.2/build.xml lucene-3.6.2.hamcrest-core/build.xml
--- lucene-3.6.2/build.xml	2012-04-04 07:32:32.000000000 +0200
+++ lucene-3.6.2.hamcrest-core/build.xml	2015-08-07 17:17:28.683822710 +0200
@@ -258,6 +258,7 @@
       <path id="javadoc.classpath">
         <path refid="classpath"/>
         <pathelement location="${ant.home}/lib/ant.jar"/>
+        <pathelement location="/usr/share/java/hamcrest/core.jar"/>
         <fileset dir="." includes="test-framework/lib/,contrib/analyzers/phonetic/lib/,contrib/benchmark/lib/,contrib/icu/lib/,contrib/queries/lib/" excludes="**/lib/*.txt"/>
       </path>
 
diff -Nru lucene-3.6.2/common-build.xml lucene-3.6.2.hamcrest-core/common-build.xml
--- lucene-3.6.2/common-build.xml	2012-07-21 19:25:04.000000000 +0200
+++ lucene-3.6.2.hamcrest-core/common-build.xml	2015-08-07 17:17:28.644824541 +0200
@@ -1004,6 +1004,7 @@
           windowtitle="${Name} ${version} API"
           doctitle="@{title}"
           maxmemory="${javadoc.maxmemory}"
+          additionalparam="-Xdoclint:none"
           bottom="Copyright &amp;copy; ${year} Apache Software Foundation.  All Rights Reserved.">
         <tag name="lucene.experimental" 
       	description="WARNING: This API is experimental and might change in incompatible ways in the next release."/>
diff -Nru lucene-3.6.2/test-framework/build.xml lucene-3.6.2.hamcrest-core/test-framework/build.xml
--- lucene-3.6.2/test-framework/build.xml	2012-04-02 19:06:33.000000000 +0200
+++ lucene-3.6.2.hamcrest-core/test-framework/build.xml	2015-08-07 17:17:28.614825950 +0200
@@ -28,6 +28,7 @@
     <pathelement location="${common.dir}/build/core/classes/java"/>
     <path refid="junit-path"/>
     <path refid="ant-path"/>
+    <fileset dir="/usr/share/java" includes="hamcrest/core.jar"/>
   </path>
 
   <!-- 
