diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes
index a7fdda6..f861aa1 100644
--- a/apache-commons-pool.changes
+++ b/apache-commons-pool.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 15 13:05:26 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * commons-pool-1.6-sourcetarget.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility
+- Run fdupes on the documentation
+
 -------------------------------------------------------------------
 Thu Sep 14 14:17:08 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index aa15761..f5632e3 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-pool
 #
-# 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
@@ -29,7 +29,8 @@ Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
 Patch0:         jakarta-commons-pool-build.patch
 Patch1:         commons-pool-1.6-sourcetarget.patch
 BuildRequires:  ant
-BuildRequires:  java-devel
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
 Provides:       jakarta-commons-pool = %{version}
@@ -78,6 +79,7 @@ install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
diff --git a/commons-pool-1.6-sourcetarget.patch b/commons-pool-1.6-sourcetarget.patch
index b1f32d6..f3639cf 100644
--- a/commons-pool-1.6-sourcetarget.patch
+++ b/commons-pool-1.6-sourcetarget.patch
@@ -6,8 +6,8 @@
        <property name="javac.deprecation" value="true"/>
 -      <property name="javac.target.version" value="1.5"/>
 -      <property name="javac.src.version" value="1.5"/>
-+      <property name="javac.target.version" value="1.6"/>
-+      <property name="javac.src.version" value="1.6"/>
++      <property name="javac.target.version" value="8"/>
++      <property name="javac.src.version" value="8"/>
     </target>
  
     <!-- ######################################################### -->