diff --git a/README.SuSE b/README.SuSE
deleted file mode 100644
index 0f7b075..0000000
--- a/README.SuSE
+++ /dev/null
@@ -1,3 +0,0 @@
-This is an (almost) empty package which requires the nss3 shared library
-subpackage.
-
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 047522c..0f7f2dd 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar 31 18:55:42 CEST 2008 - maw@suse.de
+
+- Undo the shared library package split, per discussion in
+  opensuse-packaging.
+
+-------------------------------------------------------------------
+Mon Mar 31 14:22:17 CEST 2008 - wr@rosenauer.org
+
+- new snapshot still based on 3.12.0 Beta 3 (20080330)
+
 -------------------------------------------------------------------
 Tue Mar 25 22:21:18 CET 2008 - maw@suse.de
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 75a49b8..106716d 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -18,7 +18,7 @@ BuildRequires:  sqlite-devel
 %endif
 License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Version:        3.12.0
-Release:        2
+Release:        6
 Summary:        Network (Netscape) Security Services
 Url:            http://www.mozilla.org/projects/security/pki/nss/
 Group:          System/Libraries
@@ -26,13 +26,14 @@ Source:         nss-%{version}.tar.bz2
 Source1:        nss.pc.in
 Source2:        addon-certs.txt
 Source3:        nss-config.in
-Source4:        README.SuSE
 Patch1:         nss-opt.patch
 Patch2:         nss-sqlitename.patch
 Patch3:         system-nspr.patch
 Patch4:         char.patch
 Patch5:         nss-no-rpath.patch
-Requires:       libnss3 = %{version}
+# Remove remnant traces from the package split.
+Provides:       libnss3 = %{version}-%{release}
+Obsoletes:      libnss3 <= %{version}-%{release}
 PreReq:         mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nssdbdir %{_sysconfdir}/ssl/nssdb
@@ -46,29 +47,12 @@ certificates, and other security standards.
 
 
 
-Authors:
---------
-    Mozilla Foundation <drivers@mozilla.org>
-
-%package -n libnss3
-Summary:        Network (Netscape) Security Services
-Group:          System/Libraries
-Requires:       %{name} >= %{version}
-
-%description -n libnss3
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled server
-applications. Applications built with NSS can support SSL v2 and v3,
-TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
-certificates, and other security standards.
-
-
-
 Authors:
 --------
     Mozilla Foundation <drivers@mozilla.org>
 
 %package devel
+License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Summary:        Network (Netscape) Security Services development files
 Group:          Development/Libraries/Other
 Requires:       mozilla-nspr-devel 
@@ -88,6 +72,7 @@ Authors:
     Mozilla Foundation <drivers@mozilla.org>
 
 %package tools
+License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Summary:        Tools for developing, debugging, and managing applications that use NSS.
 Group:          System/Management
 PreReq:         mozilla-nss >= %{version}-%{release}
@@ -104,7 +89,6 @@ Authors:
 
 %prep
 %setup -n nss-%{version} -q
-cp %{S:4} .
 cd mozilla
 %patch1
 %patch2
@@ -204,9 +188,9 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
                      > $RPM_BUILD_ROOT/%{_bindir}/nss-config
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
 
-%post -n libnss3 -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun -n libnss3 -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %post tools
 if [ ! -d "%{nssdbdir}" ] ; then
@@ -222,10 +206,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc README.SuSE
-
-%files -n libnss3
-%defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/*.chk
 
@@ -241,8 +221,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/nss/
 %exclude %{_bindir}/nss-config
+
 %changelog
-* Tue Mar 25 2008 maw@suse.de
+* Mon Mar 31 2008 maw@suse.de
+- Undo the shared library package split, per discussion in
+  opensuse-packaging.
+* Mon Mar 31 2008 wr@rosenauer.org
+- new snapshot still based on 3.12.0 Beta 3 (20080330)
+* Wed Mar 26 2008 maw@suse.de
 - Merge changes from the build service (thanks, Wolfgang)
 - Update to a new snapshot of nss based on 3.12.0 Beta 2:
   + Update build requirements accordingly
@@ -252,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 - disable use of freebl/mpi/mp_comba.c.  [#346256]
 * Sun Sep 16 2007 coolo@suse.de
 - fixing errors in %%post during installation
-* Thu Sep 13 2007 jberkman@novell.com
+* Fri Sep 14 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
diff --git a/nss-3.12.0.tar.bz2 b/nss-3.12.0.tar.bz2
index 773f70a..fa0ca69 100644
--- a/nss-3.12.0.tar.bz2
+++ b/nss-3.12.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:454b5c2dc14cf5c3cb4408689dbc966a0441d58c3bd5296f4e1c9718d4635781
-size 3928895
+oid sha256:a1d331e0a3c708d271b9230804159fb7cc27a6b1cd75d72da82b8091078e3d18
+size 3948863