diff --git a/hamcrest-1.3-fork-javac.patch b/hamcrest-1.3-fork-javac.patch
index 9186591..8c87049 100644
--- a/hamcrest-1.3-fork-javac.patch
+++ b/hamcrest-1.3-fork-javac.patch
@@ -16,7 +16,7 @@ Index: hamcrest-1.3/build.xml
              </manifest>
              <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
 -            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
-+            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true">
++            <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.6" includeantruntime="false" fork="true">
                  <classpath>
                      <fileset dir="lib/integration">
                          <include name="*.jar"/>
diff --git a/hamcrest.changes b/hamcrest.changes
index c66b0ae..a68767a 100644
--- a/hamcrest.changes
+++ b/hamcrest.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep  8 06:05:24 UTC 2017 - fstrba@suse.com
+
+- Modified patch:
+  * hamcrest-1.3-fork-javac.patch
+    + Specify java target level 1.6 in order to allow building
+      with jdk9
+- Specify java source level 1.6 in order to allow building with
+  jdk9
+- Require java-1_8_0-openjdk-devel since javadoc errors are fatal
+  in jdk9
+
 -------------------------------------------------------------------
 Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com
 
diff --git a/hamcrest.spec b/hamcrest.spec
index 2a334fa..9555590 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,8 @@ Patch3:         %{name}-%{version}-javadoc.patch
 Patch4:         hamcrest-1.3-random-build-crash.patch
 Patch5:         hamcrest-1.3-fork-javac.patch
 BuildRequires:  ant >= 1.6.5
-BuildRequires:  java-devel >= 1.6.0
+# Disable this one whenever the javadoc build is fixed for jdk9
+BuildRequires:  java-1_8_0-openjdk-devel
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  qdox
@@ -101,7 +102,7 @@ perl -pi -e 's/\r$//g' LICENSE.txt
 
 %build
 export CLASSPATH=$(build-classpath qdox)
-ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
+ant -Dant.build.javac.source=1.6 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
 
 # inject OSGi manifests
 mkdir -p META-INF