diff --git a/javahelp2.changes b/javahelp2.changes
index 4942e11..fef76fe 100644
--- a/javahelp2.changes
+++ b/javahelp2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 10 11:34:03 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:55 UTC 2013 - tchvatal@suse.com
 
diff --git a/javahelp2.spec b/javahelp2.spec
index 1583029..9dcb525 100644
--- a/javahelp2.spec
+++ b/javahelp2.spec
@@ -108,37 +108,26 @@ ant \
     release javadoc
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/jh2indexer
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/jh2search
-install -m 644 javahelp_nbproject/dist/lib/jhall.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-#cp -pr jhMaster/JavaHelp/doc/public-spec/dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr javahelp_nbproject/dist/lib/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# create unversioned symlinks
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-%add_to_maven_depmap javax.help %{oname} %{version} JPP %{name}
+install -d -m 755 %{buildroot}%{_javadir}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_bindir}
+install -d -m 755 %{buildroot}%{_datadir}/%{name}
+install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/jh2indexer
+install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/jh2search
+install -m 644 javahelp_nbproject/dist/lib/jhall.jar %{buildroot}%{_javadir}/%{name}.jar
+#cp -pr jhMaster/JavaHelp/doc/public-spec/dtd %{buildroot}%{_datadir}/%{name}
+cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 %{SOURCE3} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
 %doc license.txt
 %attr(0755,root,root) %{_bindir}/*
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 #%dir %{_datadir}/%{name}
 #%{_datadir}/%{name}/dtd
@@ -151,6 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog