diff --git a/ant-antlr.changes b/ant-antlr.changes
index 78c98a7..9e13fa2 100644
--- a/ant-antlr.changes
+++ b/ant-antlr.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
+
+- Detect our java-1_5_0-gcj_compat as java 6 to allow building
+  with source and target level 1.6
+  Code that needs classes from java 6 that are not part of the
+  gij/gcj will need just to require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
 
diff --git a/ant-antlr.spec b/ant-antlr.spec
index 062d354..a711412 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -45,6 +45,7 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 Patch3:         reproducible.patch
 Patch4:         apache-ant-1.9.9-sourcetarget.patch
 Patch5:         apache-ant-bootstrap.patch
+Patch6:         apache-ant-1.9.9-detect_gij_as_java6.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #BuildRequires:  java-devel >= 1.5
@@ -355,6 +356,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %patch4 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/ant-junit.changes b/ant-junit.changes
index 78c98a7..9e13fa2 100644
--- a/ant-junit.changes
+++ b/ant-junit.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
+
+- Detect our java-1_5_0-gcj_compat as java 6 to allow building
+  with source and target level 1.6
+  Code that needs classes from java 6 that are not part of the
+  gij/gcj will need just to require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
 
diff --git a/ant-junit.spec b/ant-junit.spec
index 9b1b6a3..0a1d3bc 100644
--- a/ant-junit.spec
+++ b/ant-junit.spec
@@ -45,6 +45,7 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 Patch3:         reproducible.patch
 Patch4:         apache-ant-1.9.9-sourcetarget.patch
 Patch5:         apache-ant-bootstrap.patch
+Patch6:         apache-ant-1.9.9-detect_gij_as_java6.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #BuildRequires:  java-devel >= 1.5
@@ -355,6 +356,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %patch4 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/ant.changes b/ant.changes
index 78c98a7..9e13fa2 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 29 15:35:27 UTC 2017 - fstrba@suse.com
+
+- Detect our java-1_5_0-gcj_compat as java 6 to allow building
+  with source and target level 1.6
+  Code that needs classes from java 6 that are not part of the
+  gij/gcj will need just to require java-devel >= 1.6
+
 -------------------------------------------------------------------
 Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
 
diff --git a/ant.spec b/ant.spec
index e2f6bba..ba2168f 100644
--- a/ant.spec
+++ b/ant.spec
@@ -44,6 +44,7 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 Patch3:         reproducible.patch
 Patch4:         apache-ant-1.9.9-sourcetarget.patch
 Patch5:         apache-ant-bootstrap.patch
+Patch6:         apache-ant-1.9.9-detect_gij_as_java6.patch
 %if %{with bootstrap}
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #BuildRequires:  java-devel >= 1.5
@@ -354,6 +355,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
 %patch4 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 
 # clean jar files
 %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
diff --git a/apache-ant-1.9.9-detect_gij_as_java6.patch b/apache-ant-1.9.9-detect_gij_as_java6.patch
new file mode 100644
index 0000000..d79b5e2
--- /dev/null
+++ b/apache-ant-1.9.9-detect_gij_as_java6.patch
@@ -0,0 +1,11 @@
+--- apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2017-02-02 18:55:08.000000000 +0100
++++ apache-ant-1.9.9/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2017-09-29 17:32:14.444688494 +0200
+@@ -169,7 +169,7 @@
+             Class.forName("java.net.Proxy");
+             javaVersion = JAVA_1_5;
+             javaVersionNumber++;
+-            Class.forName("java.net.CookieStore");
++            Class.forName("java.util.ServiceLoader");
+             javaVersion = JAVA_1_6;
+             javaVersionNumber++;
+             Class.forName("java.nio.file.FileSystem");