diff --git a/hamcrest-1.3-javadoc.patch b/hamcrest-1.3-javadoc.patch
index 2d387ef..fade757 100644
--- a/hamcrest-1.3-javadoc.patch
+++ b/hamcrest-1.3-javadoc.patch
@@ -18,3 +18,19 @@ Index: hamcrest-1.3/build.xml
  
          <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
                   destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
+@@ -149,6 +148,7 @@
+             
+             <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
+             <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
++            <arg value="-Xdoclint:none"/>
+         </javadoc>
+         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
+             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
+@@ -304,6 +304,7 @@
+                     <fileset file="build/hamcrest-generator-${version}.jar"/>
+                     <fileset file="build/hamcrest-integration-${version}.jar"/>
+                 </classpath>
++                <arg value="-Xdoclint:none"/>
+             </javadoc>
+             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">
+                 <fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>
diff --git a/hamcrest.changes b/hamcrest.changes
index 488c207..fd199f1 100644
--- a/hamcrest.changes
+++ b/hamcrest.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  2 15:33:14 UTC 2016 - dimstar@opensuse.org
+
+- Update hamcrest-1.3-javadoc.patch: Fix build with recent Java 1.8
+  by disabling doclint.
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com
 
diff --git a/hamcrest.spec b/hamcrest.spec
index e464ad3..641f546 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hamcrest
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed