diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes
index c1ff8d6..85d1740 100644
--- a/apache-commons-cli.changes
+++ b/apache-commons-cli.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 15 06:21:41 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * commons-cli-1.2-jdk9.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility
+- Run fdupes on the documentation
+
 -------------------------------------------------------------------
 Fri Sep 29 06:41:14 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index c79c4e0..83013ab 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-cli
 #
-# 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,9 +31,11 @@ Patch0:         commons-cli-1.2-jdk9.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  ant
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
-Requires:       java >= 1.6.0
+Requires:       java >= 1.8
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}
 Provides:       apache-cli = %{version}
@@ -80,6 +82,7 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}/
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %files
diff --git a/commons-cli-1.2-jdk9.patch b/commons-cli-1.2-jdk9.patch
index 726d338..1abad4e 100644
--- a/commons-cli-1.2-jdk9.patch
+++ b/commons-cli-1.2-jdk9.patch
@@ -5,7 +5,7 @@
  commons.manifestfile=target/osgi/MANIFEST.MF
  maven.settings.offline=true
 -maven.compile.target=1.4
-+maven.compile.target=1.6
++maven.compile.target=8
  maven.build.finalName=commons-cli-1.2
  commons.release.name=commons-cli-1.2
  maven.build.resourceDir.0=.
@@ -14,7 +14,7 @@
  commons.encoding=iso-8859-1
  commons.osgi.symbolicName=org.apache.commons.cli
 -maven.compile.source=1.4
-+maven.compile.source=1.6
++maven.compile.source=8
  organization.logo=http\://www.apache.org/images/asf_logo_wide.gif
  commons.osgi.dynamicImport=
  maven.build.testDir.0=src/test
@@ -25,11 +25,11 @@
             optimize="false" 
             deprecation="true" 
 -           target="1.4" 
-+           target="1.6" 
++           target="8" 
             verbose="false" 
             fork="false" 
 -           source="1.4">
-+           source="1.6">
++           source="8">
        <src>
          <pathelement location="${maven.build.srcDir.0}"/>
        </src>
@@ -38,11 +38,11 @@
             optimize="false" 
             deprecation="true" 
 -           target="1.4" 
-+           target="1.6" 
++           target="8" 
             verbose="false" 
             fork="false" 
 -           source="1.4">
-+           source="1.6">
++           source="8">
        <src>
          <pathelement location="${maven.build.testDir.0}"/>
        </src>
@@ -51,7 +51,7 @@
               serialwarn="false" 
               charset="ISO-8859-1" 
 -             source="1.4" 
-+             source="1.6" 
++             source="8" 
               linksource="true" 
               breakiterator="false">
        <link href="http://java.sun.com/javase/6/docs/api/"/>
@@ -63,8 +63,8 @@
    <properties>
 -    <maven.compile.source>1.4</maven.compile.source>
 -    <maven.compile.target>1.4</maven.compile.target>
-+    <maven.compile.source>1.6</maven.compile.source>
-+    <maven.compile.target>1.6</maven.compile.target>
++    <maven.compile.source>8</maven.compile.source>
++    <maven.compile.target>8</maven.compile.target>
      <commons.componentid>cli</commons.componentid>
      <commons.release.version>1.2</commons.release.version>
      <commons.release.name>commons-cli-${commons.release.version}</commons.release.name>