diff --git a/p11-kit.changes b/p11-kit.changes
index ea807f3..be937c0 100644
--- a/p11-kit.changes
+++ b/p11-kit.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jun 28 09:30:03 UTC 2013 - lnussel@suse.de
+
+- provide libnssckbi.so to replace mozilla-nss-certs
+
+-------------------------------------------------------------------
+Mon Jun 24 13:08:21 UTC 2013 - lnussel@suse.de
+
+- add p11-kit-nss-trust subpackage that serves as drop-in
+  replacement for mozilla-nss-certs
+
 -------------------------------------------------------------------
 Wed Jun 19 09:24:45 UTC 2013 - lnussel@suse.de
 
diff --git a/p11-kit.spec b/p11-kit.spec
index ae896a7..806ccda 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -68,6 +68,21 @@ p11-kit provides a way to load and enumerate PKCS#11 modules, as well
 as a standard configuration setup for installing PKCS#11 modules in
 such a way that they're discoverable.
 
+%package nss-trust
+Summary:        Adaptor to make NSS read the p11-kit trust store
+Group:          Productivity/Networking/Security
+Requires:       p11-kit = %{version}
+Conflicts:      mozilla-nss-certs
+%if %{_lib} == lib64
+Provides:       libnssckbi.so()(64bit)
+%else
+Provides:       libnssckbi.so()
+%endif
+
+%description nss-trust
+Adaptor library to make NSS read the p11-kit trust store. It has
+to be installed intead of mozilla-nss-certs.
+
 %prep
 %setup -q
 
@@ -97,6 +112,8 @@ cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{name}
 %%trustdir_cfg           %{trustdir_cfg}
 %%trustdir_static        %{trustdir_static}
 FIN
+#
+ln -s %{_libdir}/pkcs11/p11-kit-trust.so %{buildroot}%{_libdir}/libnssckbi.so
 
 %clean
 rm -rf %{buildroot}
@@ -148,4 +165,7 @@ rm -rf %{buildroot}
 %doc %dir %{_datadir}/gtk-doc/html
 %doc %{_datadir}/gtk-doc/html/p11-kit/
 
+%files nss-trust
+%{_libdir}/libnssckbi.so
+
 %changelog