diff --git a/apache-ivy-2.3.0-jdk9.patch b/apache-ivy-2.3.0-jdk9.patch
index c024bff..fe3322b 100644
--- a/apache-ivy-2.3.0-jdk9.patch
+++ b/apache-ivy-2.3.0-jdk9.patch
@@ -5,7 +5,7 @@
  rat.report.dir=${reports.dir}/rat
  
 -ivy.minimum.javaversion=1.4
-+ivy.minimum.javaversion=1.6
++ivy.minimum.javaversion=1.8
  debug.mode=on
  ivy.install.version=1.4.1
  
diff --git a/apache-ivy.changes b/apache-ivy.changes
index 1360645..0aa6802 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * apache-ivy-2.3.0-jdk9.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility in OpenJDK 11
+- Run fdupes on documentation
+
 -------------------------------------------------------------------
 Thu Sep  7 17:10:15 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index a247b0c..8a3f489 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -31,7 +31,8 @@ BuildRequires:  ant
 BuildRequires:  bouncycastle
 BuildRequires:  commons-httpclient
 BuildRequires:  dos2unix
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  jsch
@@ -98,6 +99,7 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
 # API Documentation
 install -d %{buildroot}%{_javadocdir}/%{name}
 cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 # Command line script
 MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'`