diff --git a/mozilla-nss-rpmlintrc b/mozilla-nss-rpmlintrc
new file mode 100644
index 0000000..dc8b7dc
--- /dev/null
+++ b/mozilla-nss-rpmlintrc
@@ -0,0 +1,4 @@
+addFilter("shlib-policy-name-error")
+addFilter("shlib-policy-missing-lib")
+addFilter("shlib-policy-missing-suffix")
+addFilter("shlib-unversioned-lib")
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 58ae69b..524a55d 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec 18 13:24:16 CET 2009 - wr@rosenauer.org
+
+- split mozilla-nss-certs from main package
+- added rpmlintrc to ignore expected warnings
+- added baselibs.conf as source
+
 -------------------------------------------------------------------
 Mon Dec 14 07:56:26 CET 2009 - wr@rosenauer.org
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 5711750..6260175 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -43,6 +43,8 @@ Source:         nss-%{version}.tar.bz2
 Source1:        nss.pc.in
 Source2:        addon-certs.txt
 Source3:        nss-config.in
+Source4:        %{name}-rpmlintrc
+Source5:        baselibs.conf
 Patch1:         nss-opt.patch
 Patch2:         nss-sqlitename.patch
 Patch3:         system-nspr.patch
@@ -50,12 +52,10 @@ Patch4:         char.patch
 Patch5:         nss-no-rpath.patch
 Patch6:         nss-ckbi-1_77.patch.bz2
 Patch9:         malloc.patch
-# Remove remnant traces from the package split.
-Provides:       libnss3 = %{version}-%{release}
-Obsoletes:      libnss3 <= %{version}-%{release}
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 PreReq:         mozilla-nspr >= %nspr_ver
 PreReq:         libfreebl3 >= %{version}
+Requires:       mozilla-nss-certs
 Requires(post): coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nssdbdir %{_sysconfdir}/pki/nssdb
@@ -115,6 +115,16 @@ certificates, and other security standards.
 This package installs the freebl library from NSS.
 
 
+%package certs
+License:        GPLv2+ ; LGPLv2.1+ ; MPL
+Summary:        CA certificates for NSS
+Group:          Productivity/Networking/Security
+
+%description certs
+This package contains the integrated CA root certificates from the 
+Mozilla project.
+
+
 %prep
 %setup -n nss-%{version} -q
 cd mozilla
@@ -271,7 +281,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %{_libdir}/libnss3.so
-%{_libdir}/libnssckbi.so
 %{_libdir}/libnssdbm3.so
 %{_libdir}/libnssutil3.so
 %{_libdir}/libsmime3.so
@@ -301,4 +310,8 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/libfreebl3.so
 /%{_lib}/libfreebl3.chk
 
+%files certs
+%defattr(-, root, root)
+%{_libdir}/libnssckbi.so
+
 %changelog