diff --git a/apache-ivy-2.3.0-jdk9.patch b/apache-ivy-2.3.0-jdk9.patch
new file mode 100644
index 0000000..c024bff
--- /dev/null
+++ b/apache-ivy-2.3.0-jdk9.patch
@@ -0,0 +1,22 @@
+--- apache-ivy-2.3.0/build.properties	2012-04-02 23:11:30.000000000 +0200
++++ apache-ivy-2.3.0/build.properties	2017-09-07 14:13:28.647597540 +0200
+@@ -42,7 +42,7 @@
+ checkstyle.src.dir=${basedir}/src/etc/checkstyle
+ rat.report.dir=${reports.dir}/rat
+ 
+-ivy.minimum.javaversion=1.4
++ivy.minimum.javaversion=1.6
+ debug.mode=on
+ ivy.install.version=1.4.1
+ 
+--- apache-ivy-2.3.0/build.xml	2012-04-09 08:58:36.000000000 +0200
++++ apache-ivy-2.3.0/build.xml	2017-09-07 14:46:13.128164218 +0200
+@@ -517,7 +517,7 @@
+ 	</target>
+ 
+     <target name="javadoc" unless="skip.javadoc">
+-        <javadoc destdir="${javadoc.build.dir}" useexternalfile="true">
++        <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}">
+             <fileset dir="${src.dir}" includes="**/*.java" />
+         </javadoc>
+     </target>
diff --git a/apache-ivy.changes b/apache-ivy.changes
index 4f5ee8d..1a543a0 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep  7 17:10:15 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * apache-ivy-2.3.0-jdk9.patch
+    + Use source and target version 1.6 to enable build with jdk9
+- Force using of java-1_8_0-openjdk-devel for building, since
+  javadoc errors are fatal in jdk9
+
 -------------------------------------------------------------------
 Sun May 21 08:01:08 UTC 2017 - tchvatal@suse.com
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 6e3f097..d79647a 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -26,10 +26,13 @@ Url:            http://ant.apache.org/ivy/
 Source0:        %{name}-%{version}-src.tar.gz
 Source1:        ivy.1
 Source2:        http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom
+Patch0:         apache-ivy-2.3.0-jdk9.patch
 BuildRequires:  ant
 BuildRequires:  bouncycastle
 BuildRequires:  commons-httpclient
 BuildRequires:  dos2unix
+# 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:  jsch
@@ -56,6 +59,7 @@ JavaDoc documentation for %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Fix messed-up encodings
 dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt