diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 9f92c49..d0221c4 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 13 22:26:57 CEST 2007 - jberkman@novell.com
+
+- merge -tools package into main package
+- create system-wide nssdb for system configuration of smart cards,
+  as used by pam_pkcs11, krb5 pkinit, and others
+
 -------------------------------------------------------------------
 Thu Jul 26 20:18:38 CEST 2007 - maw@suse.de
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 14d596b..a506fe7 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -14,9 +14,9 @@ Name:           mozilla-nss
 BuildRequires:  gcc-c++ mozilla-nspr-devel
 License:        GPL v2 or later, LGPL v2 or later
 Version:        3.11.7
-Release:        1
+Release:        10
 Summary:        Network (Netscape) Security Services
-URL:            http://www.mozilla.org/projects/security/pki/nss/
+Url:            http://www.mozilla.org/projects/security/pki/nss/
 Group:          System/Libraries
 Source:         nss-%{version}.tar.bz2
 Source1:        nss.pc.in
@@ -28,6 +28,8 @@ Patch3:         system-nspr.patch
 Patch4:         char.patch
 PreReq:         mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       mozilla-nss-tools = %{version}-%{release}
+Obsoletes:      mozilla-nss-tools
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -57,20 +59,6 @@ certificates, and other security standards.
 
 
 
-Authors:
---------
-    Mozilla Foundation <drivers@mozilla.org>
-
-%package tools
-Summary:        Tools for developing, debugging, and managing applications that use NSS.
-Group:          System/Management
-
-%description tools
-The NSS Security Tools allow developers to test, debug, and manage
-applications that use NSS.
-
-
-
 Authors:
 --------
     Mozilla Foundation <drivers@mozilla.org>
@@ -150,8 +138,17 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
                      -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
                      > $RPM_BUILD_ROOT/%{_bindir}/nss-config
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
+%define nssdbdir %{_sysconfdir}/ssl/nssdb
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+if [ ! -d "%{nssdbdir}" ] ; then
+	mkdir -p "%{nssdbdir}"
+fi
+if [ ! -f "%{nssdbdir}/secmod.db" ] ; then
+	modutil -force -dbdir "%{nssdbdir}" -create
+	chmod 644 "%{nssdbdir}"/*
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -162,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/*.chk
+%{_bindir}/*
+%exclude %{_bindir}/nss-config
 
 %files devel
 %defattr(644, root, root, 755)
@@ -170,12 +169,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 %attr(755,root,root) %{_bindir}/nss-config
 
-%files tools
-%defattr(-, root, root)
-%{_bindir}/*
-%exclude %{_bindir}/nss-config
-
 %changelog
+* Thu Sep 13 2007 - jberkman@novell.com
+- merge -tools package into main package
+- create system-wide nssdb for system configuration of smart cards,
+  as used by pam_pkcs11, krb5 pkinit, and others
 * Thu Jul 26 2007 - maw@suse.de
 - Update to version 3.11.7 (from the build service)
 - Bug fixes.