diff --git a/apache-commons-httpclient.changes b/apache-commons-httpclient.changes
index c74381b..1d89a9a 100644
--- a/apache-commons-httpclient.changes
+++ b/apache-commons-httpclient.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 15 10:34:34 UTC 2018 - fstrba@suse.com
+
+- 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 11:49:25 UTC 2017 - fstrba@suse.com
 
diff --git a/apache-commons-httpclient.spec b/apache-commons-httpclient.spec
index 66931cc..1943c74 100644
--- a/apache-commons-httpclient.spec
+++ b/apache-commons-httpclient.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-httpclient
 #
-# 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
@@ -36,15 +36,16 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  commons-codec
 BuildRequires:  commons-logging >= 1.0.3
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  junit
 Requires:       commons-codec
 Requires:       commons-logging >= 1.0.3
 Provides:       %{short_name} = %{version}
 Provides:       jakarta-%{short_name} = %{version}
-Obsoletes:      jakarta-%{short_name} <= 3.1
+Obsoletes:      jakarta-%{short_name} < %{version}
 Provides:       jakarta-%{short_name}3 = %{version}
-Obsoletes:      jakarta-%{short_name}3 <= 3.1
+Obsoletes:      jakarta-%{short_name}3 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -125,7 +126,7 @@ sed -i 's/\r//' LICENSE.txt
 
 %build
 ant \
-  -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+  -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
   -Djavadoc.logging.link=%{_javadocdir}/apache-commons-logging \
@@ -151,14 +152,17 @@ popd
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}
 mv dist/docs/api %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 # demo
 mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -pr src/examples src/contrib %{buildroot}%{_datadir}/%{name}
+%fdupes -s %{buildroot}%{_datadir}/%{name}
 
 # manual and docs
 rm -f dist/docs/{BUILDING,TESTING}.txt
 ln -s %{_javadocdir}/%{name} dist/docs/apidocs
+%fdupes -s dist/docs
 
 %files
 %defattr(0644,root,root,0755)