diff --git a/xmlunit.changes b/xmlunit.changes
index 00df69b..2688040 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 11 10:03:55 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:30 UTC 2013 - tchvatal@suse.com
 
diff --git a/xmlunit.spec b/xmlunit.spec
index 7c27bfa..cf44fdc 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -18,8 +18,6 @@
 #
 
 
-%define section free
-
 Name:           xmlunit
 Version:        1.0
 Release:        0
@@ -36,12 +34,11 @@ BuildRequires:  ant-junit
 BuildRequires:  ant-trax
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
+BuildRequires:  junit
+BuildRequires:  unzip
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-jaxp-1.3-apis
-%if %defined suse_version
-BuildRequires:  unzip
-%endif
 Requires:       junit
 Requires:       xalan-j2
 Requires:       xerces-j2
@@ -84,48 +81,31 @@ EOF
 %build
 export CLASSPATH=
 export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar test docs
+ant jar test docs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-# Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -m 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 # Javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %doc README.txt LICENSE.txt XMLUnit.pdf example.html
 %{_javadir}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog