diff --git a/bouncycastle.changes b/bouncycastle.changes
index ab94c1f..32ed586 100644
--- a/bouncycastle.changes
+++ b/bouncycastle.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep  9 11:05:33 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Wed Aug 28 08:25:18 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from recent javapackages-tools
+- temporary mozilla-nss to BT: in order to pass a tests
+
 -------------------------------------------------------------------
 Fri May 18 12:39:28 UTC 2012 - mvyskocil@suse.cz
 
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 8738e2a..d0778c3 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bouncycastle
 #
-# 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
@@ -20,7 +20,6 @@
 %define ver  1.46
 %define archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
 %define classname   org.bouncycastle.jce.provider.BouncyCastleProvider
-%define _mavenpomdir %{_datadir}/maven2/poms
 
 Summary:        Bouncy Castle Crypto Package for Java
 License:        MIT
@@ -37,12 +36,14 @@ Source0:        bcprov-%{archivever}-FEDORA.tar.gz
 #Source1:        http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/%{version}/bcprov-jdk16-%{version}.pom
 Source1:        bcprov-jdk16-%{version}.pom
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  jpackage-utils >= 1.5
-Requires(post):   jpackage-utils >= 1.7
-Requires(postun): jpackage-utils >= 1.7
+BuildRequires:  javapackages-tools
+Requires(post):   javapackages-tools
+Requires(postun): javapackages-tools
 BuildArch:      noarch
 BuildRequires:  java-devel
 BuildRequires:  unzip
+#FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
+BuildRequires:  mozilla-nss
 Requires:       java
 BuildRequires:  junit4
 
@@ -59,7 +60,7 @@ Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 
 %description javadoc
 API documentation for the %{name} package.
@@ -109,7 +110,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # maven pom
 install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom
-%add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov
+%add_maven_depmap JPP-bcprov.pom bcprov.jar
 
 %check
 pushd src
@@ -143,8 +144,6 @@ popd
   done
 } || :
 
-%update_maven_depmap
-
 %postun
 if [ $1 -eq 0 ] ; then
 
@@ -170,7 +169,6 @@ if [ $1 -eq 0 ] ; then
   } || :
 
 fi
-%update_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
@@ -178,10 +176,9 @@ fi
 %{_javadir}/bcprov.jar
 %{_javadir}/bcprov-%{version}.jar
 %{_javadir}/*
-%{_sysconfdir}/java/*
+%config(noreplace) %{_sysconfdir}/java/*
 %{_mavenpomdir}/JPP-bcprov.pom
 %config %{_mavendepmapfragdir}/%{name}
-%dir /usr/share/maven2
 
 %files javadoc
 %defattr(0644,root,root,0755)