diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 637cd59..194ef39 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 23 17:19:43 CET 2009 - wr@rosenauer.org
+
+- rebased patches to apply w/o fuzz
+
 -------------------------------------------------------------------
 Fri Aug 14 08:51:00 CEST 2009 - wr@rosenauer.org
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index be6e217..1da8f52 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -27,9 +27,9 @@ BuildRequires:  sqlite-devel
 %if %suse_version > 1030
 BuildRequires:  sqlite3-devel
 %endif
-License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
+License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Version:        3.12.4
-Release:        1
+Release:        2
 # bug437293
 %ifarch ppc64
 Obsoletes:      mozilla-nss-64bit
@@ -68,12 +68,8 @@ TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
 certificates, and other security standards.
 
 
-Authors:
---------
-    Mozilla Foundation
-
 %package devel
-License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
+License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Summary:        Network (Netscape) Security Services development files
 Group:          Development/Libraries/Other
 Requires:       mozilla-nspr-devel 
@@ -92,13 +88,8 @@ 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 tools
-License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
+License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Summary:        Tools for developing, debugging, and managing applications that use NSS
 Group:          System/Management
 PreReq:         mozilla-nss >= %{version}
@@ -108,13 +99,8 @@ The NSS Security Tools allow developers to test, debug, and manage
 applications that use NSS.
 
 
-
-Authors:
---------
-    Mozilla Foundation <drivers@mozilla.org>
-
 %package -n libfreebl3
-License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
+License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Summary:        Freebl library for the Network Security Services
 Group:          System/Libraries
 
@@ -128,10 +114,6 @@ certificates, and other security standards.
 This package installs the freebl library from NSS.
 
 
-Authors:
---------
-    Mozilla Foundation
-
 %prep
 %setup -n nss-%{version} -q
 cd mozilla
diff --git a/nss-sqlitename.patch b/nss-sqlitename.patch
index a39b344..dd4ea27 100644
--- a/nss-sqlitename.patch
+++ b/nss-sqlitename.patch
@@ -1,38 +1,32 @@
-Index: security/nss/lib/sqlite/manifest.mn
+Index: security/nss/cmd/platlibs.mk
 ===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
-retrieving revision 1.3
-diff -u -p -6 -r1.3 manifest.mn
---- security/nss/lib/sqlite/manifest.mn	15 Aug 2007 15:30:05 -0000	1.3
-+++ security/nss/lib/sqlite/manifest.mn	23 Jan 2008 08:39:29 -0000
-@@ -35,15 +35,16 @@
- #
- # ***** END LICENSE BLOCK *****
- CORE_DEPTH = ../../..
+RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
+retrieving revision 1.64
+diff -u -p -r1.64 platlibs.mk
+--- security/nss/cmd/platlibs.mk	17 Jun 2009 23:01:48 -0000	1.64
++++ security/nss/cmd/platlibs.mk	23 Nov 2009 16:08:54 -0000
+@@ -80,7 +80,11 @@ endif
+ endif
+ endif
  
- MODULE = nss
++ifdef NSS_USE_SYSTEM_SQLITE
+ SQLITE=-lsqlite3
++else
++SQLITE=-lnsssqlite3
++endif
  
--LIBRARY_NAME = sqlite
-+LIBRARY_NAME = nsssqlite
- LIBRARY_VERSION = 3
- MAPFILE = $(OBJDIR)/sqlite.def
-+MAPFILE_SOURCE = sqlite.def
- DEFINES += -DTHREADSAFE=1
- 
- EXPORTS = \
- 	$(NULL)
- 
- PRIVATE_EXPORTS = \
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
 Index: security/nss/lib/softoken/config.mk
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v
-retrieving revision 1.23
-diff -u -p -r1.23 config.mk
---- security/nss/lib/softoken/config.mk	5 Feb 2008 05:33:37 -0000	1.23
-+++ security/nss/lib/softoken/config.mk	19 Feb 2008 11:50:02 -0000
-@@ -86,12 +86,16 @@ else
- EXTRA_SHARED_LIBS += \
+retrieving revision 1.29
+diff -u -p -r1.29 config.mk
+--- security/nss/lib/softoken/config.mk	11 Jun 2009 00:55:48 -0000	1.29
++++ security/nss/lib/softoken/config.mk	23 Nov 2009 16:08:55 -0000
+@@ -83,12 +83,16 @@ EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
 -	-lsqlite3 \
  	-L$(NSPR_LIB_DIR) \
@@ -48,28 +42,22 @@ diff -u -p -r1.23 config.mk
  endif
  
  ifeq ($(OS_TARGET),AIX)
-Index: security/nss/cmd/platlibs.mk
+Index: security/nss/lib/sqlite/manifest.mn
 ===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
-retrieving revision 1.59
-diff -u -p -6 -r1.59 platlibs.mk
---- security/nss/cmd/platlibs.mk	2 Dec 2008 23:24:46 -0000	1.59
-+++ security/nss/cmd/platlibs.mk	14 Apr 2009 11:07:52 -0000
-@@ -69,13 +69,17 @@ EXTRA_SHARED_LIBS += \
- else
- EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
- endif
- endif
- endif
+RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v
+retrieving revision 1.3
+diff -u -p -r1.3 manifest.mn
+--- security/nss/lib/sqlite/manifest.mn	15 Aug 2007 15:30:05 -0000	1.3
++++ security/nss/lib/sqlite/manifest.mn	23 Nov 2009 16:08:55 -0000
+@@ -38,9 +38,10 @@ CORE_DEPTH = ../../..
  
-+ifdef NSS_USE_SYSTEM_SQLITE
- SQLITE=-lsqlite3
-+else
-+SQLITE=-lnsssqlite3
-+endif
+ MODULE = nss
  
- ifdef NSS_DISABLE_DBM
- DBMLIB = $(NULL)
- else
- DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
- endif
+-LIBRARY_NAME = sqlite
++LIBRARY_NAME = nsssqlite
+ LIBRARY_VERSION = 3
+ MAPFILE = $(OBJDIR)/sqlite.def
++MAPFILE_SOURCE = sqlite.def
+ DEFINES += -DTHREADSAFE=1
+ 
+ EXPORTS = \
diff --git a/system-nspr.patch b/system-nspr.patch
index 8526d2c..31474b5 100644
--- a/system-nspr.patch
+++ b/system-nspr.patch
@@ -1,11 +1,16 @@
---- mozilla/security/nss/Makefile
-+++ security/nss/Makefile
-@@ -78,7 +78,7 @@
+Index: security/nss/Makefile
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/Makefile,v
+retrieving revision 1.36
+diff -u -p -r1.36 Makefile
+--- security/nss/Makefile	2 Dec 2008 23:24:39 -0000	1.36
++++ security/nss/Makefile	23 Nov 2009 16:19:04 -0000
+@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
  
 -nss_build_all: build_coreconf build_nspr build_dbm all
 +nss_build_all: build_coreconf build_dbm all
  
- build_coreconf:
- 	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)
+ nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+