diff --git a/jsr-305.changes b/jsr-305.changes
index 06ac402..e1e088c 100644
--- a/jsr-305.changes
+++ b/jsr-305.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 10 09:58:16 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+- don't install versioned jars and javadocs
+
+-------------------------------------------------------------------
+Mon Sep  9 11:06:06 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
 -------------------------------------------------------------------
 Thu Jan 26 10:47:40 UTC 2012 - mvyskocil@suse.cz
 
diff --git a/jsr-305.spec b/jsr-305.spec
index 08ae3b8..7d84846 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jsr-305
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,11 +34,11 @@ Source1:        jsr-305-ri-build.xml
 # The URL reffers to New BSD License - used <OWNER> == Bill Pugh, <YEAR> == 2008
 Source2:        license
 Provides:       jsr305 = %{version}-%{release}
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  java-javadoc
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-tools
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -74,43 +74,28 @@ popd
 %install
 # jars
 %{__mkdir_p} %{buildroot}%{_javadir}
-%{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
+%{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar
 
 # poms
-%add_to_maven_depmap org.jsr-305 %{name} %{version} JPP %{name}
-
-%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
-%{__cp} -a ri/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
+%{__mkdir_p} %{buildroot}%{_mavenpomdir}
+%{__cp} -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 # javadoc
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %doc license
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%{_javadir}/jsr305-%{version}.jar
 %{_javadir}/jsr305.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %config %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog