diff --git a/saxon6.changes b/saxon6.changes
index 24ff672..d4cba90 100644
--- a/saxon6.changes
+++ b/saxon6.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 18 17:51:41 UTC 2017 - fstrba@suse.com
+
+- Specify java source and target 1.6 to fix build with jdk9
+
 -------------------------------------------------------------------
 Fri May 19 17:10:09 UTC 2017 - tchvatal@suse.com
 
diff --git a/saxon6.spec b/saxon6.spec
index 05e1d2d..0cf03a9 100644
--- a/saxon6.spec
+++ b/saxon6.spec
@@ -40,6 +40,7 @@ Patch4:         saxon-add-fixes-from-com-isl-saxon-aelfred.patch
 #PATCH-FIX-OPENSUSE: implements batch mode in which saxon is capable to proceed more files per one JVM launch
 Patch5:         saxon6-batch.patch
 BuildRequires:  ant
+BuildRequires:  fdupes
 BuildRequires:  fop >= 0.20.1
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
@@ -50,7 +51,6 @@ Requires:       %{_sbindir}/update-alternatives
 Requires:       jaxp_parser_impl
 Provides:       jaxp_transform_impl = %{name}-%{version}
 Provides:       saxon
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -157,7 +157,7 @@ rm -rf *.jar docs/api
 export LC_ALL=en_US.ISO-8859-2
 export CLASSPATH=%(build-classpath xml-commons-apis xmlgraphics-fop jdom)
 ant \
-  -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+  -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
   -Dj2se.javadoc=%{_javadocdir}/java \
   -Dfop.javadoc=%{_javadocdir}/fop \
   -Djdom.javadoc=%{_javadocdir}/jdom
@@ -173,6 +173,7 @@ cp -p build/lib/saxon-jdom.jar %{buildroot}%{_javadir}/%{name}-jdom.jar
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 # demo
 mkdir -p %{buildroot}%{_datadir}/%{name}
@@ -203,34 +204,27 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %files
-%defattr(0644,root,root,0755)
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}.jar
 %{_javadir}/jaxp_transform_impl.jar
 %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
 
 %files aelfred
-%defattr(0644,root,root,0755)
 %{_javadir}/%{name}-aelfred*
 
 %files fop
-%defattr(0644,root,root,0755)
 %{_javadir}/%{name}-fop*
 
 %files jdom
-%defattr(0644,root,root,0755)
 %{_javadir}/%{name}-jdom*
 
 %files manual
-%defattr(0644,root,root,0755)
 %doc doc/*.html
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}
 
 %files scripts