diff --git a/ext/nss-wdk/nss-wdk.patch b/ext/nss-wdk/nss-wdk.patch
index 72b56d5f..fdbdbf8c 100644
--- a/ext/nss-wdk/nss-wdk.patch
+++ b/ext/nss-wdk/nss-wdk.patch
@@ -1,6 +1,6 @@
-diff -ruN nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h nss-3.12.9/mozilla/dbm/include/mcom_db.h
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h nss-3.12.9/mozilla/dbm/include/mcom_db.h
 --- nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
-+++ nss-3.12.9/mozilla/dbm/include/mcom_db.h	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/dbm/include/mcom_db.h	2011-02-11 00:03:42 +0100
 @@ -40,6 +40,15 @@
  #define off_t long
  #endif
@@ -17,9 +17,9 @@ diff -ruN nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h nss-3.12.9/mozilla/dbm/i
  #ifndef macintosh
  #include <sys/types.h>
  #endif
-diff -ruN nss-3.12.9.orig/mozilla/dbm/src/mktemp.c nss-3.12.9/mozilla/dbm/src/mktemp.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/src/mktemp.c nss-3.12.9/mozilla/dbm/src/mktemp.c
 --- nss-3.12.9.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:32 +0200
-+++ nss-3.12.9/mozilla/dbm/src/mktemp.c	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/dbm/src/mktemp.c	2011-02-11 00:03:42 +0100
 @@ -45,13 +45,13 @@
  #include <ctype.h>
  #include "mcom_db.h"
@@ -38,9 +38,9 @@ diff -ruN nss-3.12.9.orig/mozilla/dbm/src/mktemp.c nss-3.12.9/mozilla/dbm/src/mk
  #endif
  
  static int _gettemp(char *path, register int *doopen, int extraFlags);
-diff -ruN nss-3.12.9.orig/mozilla/nsprpub/config/config.mk nss-3.12.9/mozilla/nsprpub/config/config.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/config/config.mk nss-3.12.9/mozilla/nsprpub/config/config.mk
 --- nss-3.12.9.orig/mozilla/nsprpub/config/config.mk	2010-07-09 04:10:34 +0200
-+++ nss-3.12.9/mozilla/nsprpub/config/config.mk	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/nsprpub/config/config.mk	2011-02-11 00:03:42 +0100
 @@ -154,6 +154,15 @@
  DEFINES += -DMOZ_UNICODE
  endif
@@ -57,9 +57,9 @@ diff -ruN nss-3.12.9.orig/mozilla/nsprpub/config/config.mk nss-3.12.9/mozilla/ns
  ####################################################################
  #
  # Configuration for the release process
-diff -ruN nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in
 --- nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in	2010-10-13 02:52:54 +0200
-+++ nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in	2011-02-11 00:03:42 +0100
 @@ -197,9 +197,17 @@
  ifdef NS_USE_GCC
  OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
@@ -78,9 +78,9 @@ diff -ruN nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.9/mozilla/
  
  ifeq ($(OS_ARCH),WINCE)
  OS_LIBS		= ws2.lib
-diff -ruN nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
 --- nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2010-08-15 22:59:14 +0200
-+++ nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2011-02-11 00:03:42 +0100
 @@ -625,7 +625,11 @@
       */
      hasFdInheritBuffer = (attr && attr->fdInheritBuffer);
@@ -93,9 +93,9 @@ diff -ruN nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.9/
      }
  
      if (envp != NULL) {
-diff -ruN nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.9/mozilla/security/coreconf/WIN32.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.9/mozilla/security/coreconf/WIN32.mk
 --- nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk	2010-08-18 03:28:06 +0200
-+++ nss-3.12.9/mozilla/security/coreconf/WIN32.mk	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/security/coreconf/WIN32.mk	2011-02-11 00:03:42 +0100
 @@ -145,6 +145,14 @@
  else # !NS_USE_GCC
      OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS
@@ -111,9 +111,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.9/mozilla/
      ifeq ($(_MSC_VER),$(_MSC_VER_6))
      ifndef MOZ_DEBUG_SYMBOLS
  	OS_DLLFLAGS += -PDB:NONE
-diff -ruN nss-3.12.9.orig/mozilla/security/coreconf/arch.mk nss-3.12.9/mozilla/security/coreconf/arch.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/arch.mk nss-3.12.9/mozilla/security/coreconf/arch.mk
 --- nss-3.12.9.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:50 +0200
-+++ nss-3.12.9/mozilla/security/coreconf/arch.mk	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/security/coreconf/arch.mk	2011-02-11 00:03:42 +0100
 @@ -268,7 +268,15 @@
  # the uname.exe in the MSYS toolkit.
  #
@@ -131,9 +131,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/coreconf/arch.mk nss-3.12.9/mozilla/s
      OS_ARCH = WINNT
      USE_MSYS = 1
      ifndef CPU_ARCH
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk
 --- nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:34 +0200
-+++ nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk	2011-02-11 00:03:42 +0100
 @@ -249,3 +249,11 @@
  endif
  
@@ -146,9 +146,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.9/mozill
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c
 --- nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-04-03 20:27:28 +0200
-+++ nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c	2011-02-11 00:03:42 +0100
 @@ -51,8 +51,13 @@
  #endif
  
@@ -163,9 +163,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.
  
  #include <signal.h>
  #include <stdlib.h>
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
 --- nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2009-03-10 22:18:08 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2011-02-10 22:41:08 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2011-02-11 00:03:42 +0100
 @@ -80,7 +80,11 @@
  
  #elif defined(_MSC_VER)
@@ -178,9 +178,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3
  
  void freebl_cpuid(unsigned long op, unsigned long *eax, 
             unsigned long *ebx, unsigned long *ecx, 
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c
 --- nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c	2011-01-06 20:05:58 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c	2011-02-11 00:03:42 +0100
 @@ -50,6 +50,13 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -195,9 +195,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.9/
  #include <stdio.h>
  #include "prio.h"
  #include "prerror.h"
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk
 --- nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 02:55:50 +0200
-+++ nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk	2011-02-11 00:03:42 +0100
 @@ -96,3 +96,11 @@
  ifeq ($(OS_TARGET),WINCE)
  DEFINES += -DDBM_USING_NSPR
@@ -210,9 +210,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk n
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c
 --- nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 06:42:38 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c	2011-02-11 00:03:42 +0100
 @@ -10980,7 +10980,8 @@
  ** localtime_s().
  */
@@ -223,9 +223,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.9/m
  #define HAVE_LOCALTIME_S 1
  #endif
  
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h
 --- nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2010-07-31 06:33:52 +0200
-+++ nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h	2011-02-11 00:03:42 +0100
 @@ -1624,8 +1624,13 @@
  #elif defined(_WIN32_WCE)
  #define SSL_GETPID GetCurrentProcessId
@@ -240,9 +240,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.9/mozi
  #else
  #define SSL_GETPID() 0
  #endif
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk
 --- nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 02:13:10 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk	2011-02-11 00:03:42 +0100
 @@ -46,3 +46,11 @@
  PROGRAM        =
  
@@ -255,9 +255,9 @@ diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.9/moz
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN nss-3.12.9.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c
+diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c
 --- nss-3.12.9.orig/mozilla/security/nss/lib/zlib/gzio.c	2009-11-07 02:13:10 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c	2011-02-10 22:41:09 +0100
++++ nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c	2011-02-11 00:03:42 +0100
 @@ -11,6 +11,12 @@
  
  #include "zutil.h"