diff --git a/ant-antlr.changes b/ant-antlr.changes
index a1904aa..b9bd49d 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep  6 17:49:21 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * apache-ant-1.9.9-sourcetarget.patch
+    + Change java source and target versions to 1.6 to allow build
+      with jdk9
+- For non-boostrap builds require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index a0f6179..ad5fa80 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -43,6 +43,7 @@ Patch0:         apache-ant-no-test-jar.patch
 Patch1:         apache-ant-class-path-in-manifest.patch
 #PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
 Patch3:         reproducible.patch
+Patch4:         apache-ant-1.9.9-sourcetarget.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
@@ -50,7 +51,7 @@ BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
 #!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
 %else
-BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  java-devel >= 1.6.0
 %endif
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
@@ -350,6 +351,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %endif
 %patch1
 %patch3 -p1
+%if ! %{with bootstrap}
+%patch4 -p1
+%endif
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/ant-junit.changes b/ant-junit.changes
index a1904aa..b9bd49d 100644
--- a/ant-junit.changes
+++ b/ant-junit.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep  6 17:49:21 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * apache-ant-1.9.9-sourcetarget.patch
+    + Change java source and target versions to 1.6 to allow build
+      with jdk9
+- For non-boostrap builds require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant-junit.spec b/ant-junit.spec
index 6af3cbb..b17017c 100644
--- a/ant-junit.spec
+++ b/ant-junit.spec
@@ -43,6 +43,7 @@ Patch0:         apache-ant-no-test-jar.patch
 Patch1:         apache-ant-class-path-in-manifest.patch
 #PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
 Patch3:         reproducible.patch
+Patch4:         apache-ant-1.9.9-sourcetarget.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
@@ -50,7 +51,7 @@ BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
 #!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
 %else
-BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  java-devel >= 1.6.0
 %endif
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
@@ -350,6 +351,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %endif
 %patch1
 %patch3 -p1
+%if ! %{with bootstrap}
+%patch4 -p1
+%endif
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/ant.changes b/ant.changes
index a1904aa..b9bd49d 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep  6 17:49:21 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * apache-ant-1.9.9-sourcetarget.patch
+    + Change java source and target versions to 1.6 to allow build
+      with jdk9
+- For non-boostrap builds require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Jun  9 09:05:31 UTC 2017 - tchvatal@suse.com
 
diff --git a/ant.spec b/ant.spec
index e519c4c..fc5f7ad 100644
--- a/ant.spec
+++ b/ant.spec
@@ -42,6 +42,7 @@ Patch0:         apache-ant-no-test-jar.patch
 Patch1:         apache-ant-class-path-in-manifest.patch
 #PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
 Patch3:         reproducible.patch
+Patch4:         apache-ant-1.9.9-sourcetarget.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
@@ -49,7 +50,7 @@ BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
 #!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
 %else
-BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  java-devel >= 1.6.0
 %endif
 BuildRequires:  antlr-bootstrap
 BuildRequires:  javapackages-tools
@@ -349,6 +350,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %endif
 %patch1
 %patch3 -p1
+%if ! %{with bootstrap}
+%patch4 -p1
+%endif
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/apache-ant-1.9.9-sourcetarget.patch b/apache-ant-1.9.9-sourcetarget.patch
new file mode 100644
index 0000000..1587832
--- /dev/null
+++ b/apache-ant-1.9.9-sourcetarget.patch
@@ -0,0 +1,13 @@
+--- apache-ant-1.9.9/build.xml	2017-02-02 18:55:08.000000000 +0100
++++ apache-ant-1.9.9/build.xml	2017-09-06 19:42:13.917021125 +0200
+@@ -104,8 +104,8 @@
+   <property name="chmod.maxparallel" value="250"/>
+   <property name="deprecation" value="false"/>
+   <property name="optimize" value="true"/>
+-  <property name="javac.target" value="1.5"/>
+-  <property name="javac.source" value="1.5"/>
++  <property name="javac.target" value="1.6"/>
++  <property name="javac.source" value="1.6"/>
+   <property name="junit.filtertrace" value="off"/>
+   <property name="junit.summary" value="no"/>
+   <property name="test.haltonfailure" value="false"/>