diff --git a/avalon-logkit.changes b/avalon-logkit.changes
index f276ff3..e1be841 100644
--- a/avalon-logkit.changes
+++ b/avalon-logkit.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep 15 16:14:15 UTC 2017 - jengelh@inai.de
+
+- RPM group and minor spelling fix. Replacement of
+  -exec rm by -delete.
+
+-------------------------------------------------------------------
+Fri Sep 15 09:20:19 UTC 2017 - fstrba@suse.com
+
+- Fix build with jdk9 by specifying java source and target 1.6
+- Clean spec file
+
 -------------------------------------------------------------------
 Sun May 21 08:08:29 UTC 2017 - tchvatal@suse.com
 
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 73807d5..603b08d 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -36,7 +36,8 @@ Patch2:         avalon-logkit-encoding.patch
 Patch3:         fix-java7-compile.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
-BuildRequires:  avalon-framework >= 4.1.4
+BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javamail
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
@@ -45,19 +46,18 @@ BuildRequires:  jms
 BuildRequires:  log4j
 BuildRequires:  servlet >= 3.0
 BuildRequires:  unzip
-Requires:       avalon-framework >= 4.1.4
 Requires:       jms
 Requires:       servlet >= 3.0
 BuildArch:      noarch
 
 %description
-LogKit is a logging toolkit designed for secure performance orientated
+LogKit is a logging toolkit designed for secure performance oriented
 logging in applications. To get started using LogKit, it is recomended
 that you read the whitepaper and browse the API docs.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description javadoc
 API documentation for %{name}.
@@ -71,22 +71,21 @@ cp %{SOURCE1} pom.xml
 %patch3
 
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+find . -name "*.jar" -delete
 
 %build
-export CLASSPATH=%(build-classpath \
+ant clean
+mkdir -p target/lib
+build-jar-repository -s -p target/lib \
                    log4j \
                    javamail/mailapi \
                    jms_api \
                    tomcat-servlet-api \
-                   jdbc-stdext \
-                   avalon-framework \
                    junit \
-                  ):$PWD/build/classes
 
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-    -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
-    -lib %{_datadir}/java
+ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+    -Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \
+    jar javadoc
 
 %install
 # jars
@@ -101,16 +100,15 @@ install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(0644,root,root,0755)
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/*
 %{_datadir}/maven-metadata/%{name}.xml
 %{_mavenpomdir}/JPP-%{name}.pom
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadocdir}/*