diff --git a/.gitattributes b/.gitattributes
index 9b03811..8bb9bd9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,6 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+cert9.db filter=lfs diff=lfs merge=lfs -text
+key4.db filter=lfs diff=lfs merge=lfs -text
diff --git a/cert9.db b/cert9.db
new file mode 100644
index 0000000..235dbf2
--- /dev/null
+++ b/cert9.db
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bda6ce59a46dea427681cc8a76295e34c7c2f17f4a2f265b39cfe258ab65ded
+size 9216
diff --git a/key4.db b/key4.db
new file mode 100644
index 0000000..5e7d8ee
--- /dev/null
+++ b/key4.db
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51ca7b19639cde32fb555b0d10a3b6a1fec0b2ab002062fd611cdc7ad73c2268
+size 11264
diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 409a76d..99ec415 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jul  9 16:32:33 UTC 2010 - jengelh@medozas.de
+
+- Disable testsuite on SPARC. Some tests fails, probably due to
+  just bad timing/luck.
+
+-------------------------------------------------------------------
+Thu Jun  3 22:45:51 CEST 2010 - wr@rosenauer.org
+
+- Use preloaded empty system database since creating with 
+  modutil leaves database in nonusable state
+
 -------------------------------------------------------------------
 Sat Apr 24 11:38:23 UTC 2010 - coolo@novell.com
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index c62a8a1..d0118f4 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -30,7 +30,7 @@ BuildRequires:  sqlite3-devel
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Version:        3.12.6
-Release:        4
+Release:        5
 # bug437293
 %ifarch ppc64
 Obsoletes:      mozilla-nss-64bit
@@ -47,6 +47,9 @@ Source3:        nss-config.in
 Source4:        %{name}-rpmlintrc
 Source5:        baselibs.conf
 Source6:        setup-nsssysinit.sh
+Source7:        cert9.db
+Source8:        key4.db
+Source9:        pkcs11.txt
 Patch1:         nss-opt.patch
 Patch2:         nss-sqlitename.patch
 Patch3:         system-nspr.patch
@@ -62,7 +65,9 @@ PreReq:         libsoftokn3 >= %{nss_softokn_fips_version}
 Requires:       mozilla-nss-certs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nssdbdir %{_sysconfdir}/pki/nssdb
+%ifnarch %sparc
 %define run_testsuite 1
+%endif
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -194,7 +199,7 @@ export NSS_USE_SYSTEM_SQLITE=1
 MAKE_FLAGS="BUILD_OPT=1 NSS_ENABLE_ECC=1"
 make nss_build_all $MAKE_FLAGS
 # run testsuite
-%if %run_testsuite
+%if 0%{?run_testsuite}
 export BUILD_OPT=1
 export HOST="localhost"
 export DOMSUF=" "
@@ -215,7 +220,7 @@ mkdir -p $RPM_BUILD_ROOT%{_includedir}/nss3
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
-mkdir -p $RPM_BUILD_ROOT/%nssdbdir
+mkdir -p $RPM_BUILD_ROOT%{nssdbdir}
 pushd mozilla/dist/Linux*
 # copy headers
 cp -rL ../public/nss/*.h $RPM_BUILD_ROOT%{_includedir}/nss3
@@ -289,14 +294,10 @@ cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-config
 # setup-nsssysinfo.sh
 install -m 744 %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/
-# create empty NSS database
-LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib}:$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/modutil -force -dbdir "sql:$RPM_BUILD_ROOT%{nssdbdir}" -create
-chmod 644 "$RPM_BUILD_ROOT%{nssdbdir}"/*
-sed "s:%{buildroot}::g
-s/^library=$/library=libnsssysinit.so/
-/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/" \
-  $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt > $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt.sed
-mv $RPM_BUILD_ROOT%{nssdbdir}/pkcs11.txt{.sed,}
+# copy empty NSS database
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{nssdbdir}
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{nssdbdir}
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{nssdbdir}
 # create shlib sigs after extracting debuginfo
 %define __spec_install_post \
   %{?__debug_package:%{__debug_install_post}} \
diff --git a/pkcs11.txt b/pkcs11.txt
new file mode 100644
index 0000000..085626a
--- /dev/null
+++ b/pkcs11.txt
@@ -0,0 +1,5 @@
+library=libnsssysinit.so
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+