diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile
index 8778b60aa15..fef59d84b92 100644
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2006/11/10 14:16:41 wilfried Exp $
+# $OpenBSD: Makefile,v 1.46 2006/11/17 19:20:19 kurt Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc sparc sparc64
 
@@ -6,7 +6,7 @@ COMMENT=	"redesign of the integrated Mozilla App-Suite mail component"
 
 VER=		1.5.0.8
 DISTNAME=	mozilla
-PKGNAME=	mozilla-thunderbird-${VER}
+PKGNAME=	mozilla-thunderbird-${VER}p0
 SO_VERSION=	10.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
@@ -14,8 +14,8 @@ SO_VERSION=	10.0
 	composer docshell editor embedcomponents fileview gfx_gtk gfxps \
 	gfxpsshar gkgfx gklayout gtkembedmoz gtkxtbin htmlpars i18n imglib2 \
 	import jar50 jsd ldap50 mail mailcomps mork mozfind mozjs mozldap \
-	msgsmime myspell necko necko2 nsappshell nspr4 nss3 nssckbi pipboot \
-	pipnss pippki plc4 plds4 pref prldap50 rdf remoteservice smime3 \
+	msgsmime myspell necko necko2 nsappshell nss3 nssckbi pipboot \
+	pipnss pippki pref prldap50 rdf remoteservice smime3 \
 	softokn3 spellchecker ssl3 system-pref toolkitcomps txmgr uconv \
 	universalchardet wallet walletviewers webbrwsr websrvcs widget_gtk2 \
 	xmlextras xpcom xpcom_compat xpcom_compat_c xpcom_core xpconnect \
@@ -34,8 +34,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	X11 Xext Xft Xrender Xinerama Xt c fontconfig freetype m pthread z \
 		atk-1.0 cairo glib-2.0 gmodule-2.0 gobject-2.0 \
-		jpeg pango-1.0 pangoft2-1.0 pangocairo-1.0 png
-WANTLIB+=	stdc++
+		jpeg pango-1.0 pangoft2-1.0 pangocairo-1.0 png stdc++
 
 MASTER_SITES=	http://ftp.eu.mozilla.org/pub/mozilla.org/thunderbird/releases/${VER}/source/ \
 		http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${VER}/source/
@@ -46,7 +45,8 @@ RUN_DEPENDS=	:esound-*:audio/esound
 BUILD_DEPENDS=	:libIDL-*:devel/libIDL \
 		:zip->=2.3:archivers/zip \
 		:pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
+		nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.3p2:devel/nspr
 
 VMEM_WARNING=	Yes
 
@@ -57,7 +57,6 @@ NO_REGRESS=	Yes
 SUBST_VARS=	LOCALBASE SO_VERSION
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
-				${WRKSRC}/nsprpub/build/autoconf \
 				${WRKSRC}/directory/c-sdk/config/autoconf
 
 AUTOCONF_VERSION= 2.13
@@ -65,8 +64,8 @@ CONFIGURE_STYLE= autoconf no-autoheader
 CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
 		--with-system-zlib=/usr/lib	\
+		--with-system-nspr		\
 		--with-pthreads			\
-		--without-system-nspr		\
 		--enable-xft			\
 		--enable-optimize=-Os		\
 		--enable-default-toolkit=gtk2	\
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_config_rules_mk b/mail/mozilla-thunderbird/patches/patch-nsprpub_config_rules_mk
deleted file mode 100644
index cf682cc9fc4..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_config_rules_mk
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_config_rules_mk,v 1.3 2006/07/02 15:54:55 steven Exp $
---- nsprpub/config/rules.mk.orig	Thu Feb 23 00:03:11 2006
-+++ nsprpub/config/rules.mk	Thu Jun 29 08:50:40 2006
-@@ -232,7 +232,7 @@ ifdef RELEASE_HEADERS
- 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
- endif
- ifdef RELEASE_LIBS
--	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
-+	$(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
- endif
- 	+$(LOOP_OVER_DIRS)
- 
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_configure_in b/mail/mozilla-thunderbird/patches/patch-nsprpub_configure_in
deleted file mode 100644
index 5097a7c969e..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_configure_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-nsprpub_configure_in,v 1.6 2006/07/02 15:54:55 steven Exp $
---- nsprpub/configure.in.orig	Thu Feb 23 00:03:11 2006
-+++ nsprpub/configure.in	Thu Jun 29 08:50:40 2006
-@@ -1704,9 +1704,11 @@ mips-sony-newsos*)
-     AC_DEFINE(OPENBSD)
-     AC_DEFINE(HAVE_BSD_FLOCK)
-     AC_DEFINE(HAVE_SOCKLEN_T)
-+    AC_DEFINE(_PR_HAVE_GETPROTO_R)
-+    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
-     CFLAGS="$CFLAGS -ansi -Wall"
-     CXXFLAGS="$CXXFLAGS -ansi -Wall"
--    DLL_SUFFIX=so.1.0
-+    DLL_SUFFIX="so.${SO_VERSION}"
-     DSO_CFLAGS=-fPIC
-     MDCPUCFG_H=_openbsd.cfg
-     PR_MD_CSRCS=openbsd.c
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_md__openbsd_h b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_md__openbsd_h
deleted file mode 100644
index 9bc6cee5bcd..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_md__openbsd_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.6 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/include/md/_openbsd.h.orig	Wed Apr 28 02:33:44 2004
-+++ nsprpub/pr/include/md/_openbsd.h	Sat Sep 10 19:48:15 2005
-@@ -56,7 +56,7 @@
- #define _PR_SI_ARCHITECTURE "sparc"
- #endif
- 
--#define PR_DLL_SUFFIX		".so.1.0"
-+#define PR_DLL_SUFFIX		".so._SO_VERSION_"
- 
- #define _PR_VMBASE              0x30000000
- #define _PR_STACK_VMBASE	0x50000000
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_private_primpl_h b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_private_primpl_h
deleted file mode 100644
index 26056f3fe10..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_private_primpl_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.3 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/include/private/primpl.h.orig	Thu Aug 18 19:24:29 2005
-+++ nsprpub/pr/include/private/primpl.h	Sat Sep 10 09:08:28 2005
-@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void);
-         && !defined(DARWIN) \
-         && !defined(NEXTSTEP) \
-         && !defined(QNX) \
-+        && !defined(__OpenBSD__) \
-         && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
- #define _PR_OVERRIDE_MALLOC
- #endif
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prdtoa_c b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prdtoa_c
deleted file mode 100644
index 36a78722291..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prdtoa_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/src/misc/prdtoa.c.orig	Thu Aug 18 19:24:37 2005
-+++ nsprpub/pr/src/misc/prdtoa.c	Thu Nov  3 10:46:07 2005
-@@ -855,7 +855,7 @@ mult
- 	wc = wa + wb;
- 	if (wc > a->maxwds)
- 		k++;
--	c = Balloc(k);
-+	c = Balloc(k+2);
- 	for(x = c->x, xa = x + wc; x < xa; x++)
- 		*x = 0;
- 	xa = a->x;
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prinit_c b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prinit_c
deleted file mode 100644
index 5a031bb51be..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prinit_c
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.2 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/src/misc/prinit.c.orig	Wed Apr 28 02:34:07 2004
-+++ nsprpub/pr/src/misc/prinit.c	Sat Sep 10 09:08:28 2005
-@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
- 	    _PR_LogCleanup();
- 
-         /*
-+         * accesses the current thread
-+         */
-+        _PR_CleanupNet();
-+        _PR_CleanupIO();
-+
-+        /*
-          * This part should look like the end of _PR_NativeRunThread
-          * and _PR_UserRunThread.
-          */
-@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-             PR_DELETE(me->stack);
-             PR_DELETE(me);
-         }
-+        _PR_MD_SET_CURRENT_THREAD(NULL);
- 
-         /*
-          * XXX: We are freeing the heap memory here so that Purify won't
-@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
-          * Ideally, for each _PR_InitXXX(), there should be a corresponding
-          * _PR_XXXCleanup() that we can call here.
-          */
--        _PR_CleanupNet();
--        _PR_CleanupIO();
- #ifdef WINNT
-         _PR_CleanupCPUs();
- #endif
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prnetdb_c b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prnetdb_c
deleted file mode 100644
index ee6e72ea7d8..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prnetdb_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.5 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig	Thu Aug 18 19:24:38 2005
-+++ nsprpub/pr/src/misc/prnetdb.c	Sat Sep 10 09:08:28 2005
-@@ -2110,7 +2110,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         hints.ai_socktype = SOCK_STREAM;
- 
-+	LOCK_DNS();
-+
-         rv = GETADDRINFO(hostname, NULL, &hints, &res);
-+
-+	UNLOCK_DNS();
-+
-         if (rv == 0)
-             return (PRAddrInfo *) res;
- 
diff --git a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_pthreads_ptthread_c b/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
deleted file mode 100644
index 91da49d6e16..00000000000
--- a/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.2 2006/01/23 12:34:06 wilfried Exp $
---- nsprpub/pr/src/pthreads/ptthread.c.orig	Thu Aug 18 19:24:38 2005
-+++ nsprpub/pr/src/pthreads/ptthread.c	Sat Sep 10 09:08:28 2005
-@@ -51,6 +51,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
-+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
- 
- /*
-  * Record whether or not we have the privilege to set the scheduling
diff --git a/mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk b/mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk
index c65ab4d78dc..e33673726f5 100644
--- a/mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk
+++ b/mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/01/23 12:34:06 wilfried Exp $
---- security/coreconf/OpenBSD.mk.orig	Sun Apr 25 17:02:17 2004
-+++ security/coreconf/OpenBSD.mk	Sat Sep 10 09:08:28 2005
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.6 2006/11/17 19:20:19 kurt Exp $
+--- security/coreconf/OpenBSD.mk.orig	Sun Apr 25 11:02:17 2004
++++ security/coreconf/OpenBSD.mk	Tue Nov  7 15:23:44 2006
 @@ -37,12 +37,12 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -27,7 +27,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/01/23 12:34:06 wilfried
  
  OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
  
-@@ -64,7 +64,7 @@ OS_LIBS			= 
+@@ -64,8 +64,9 @@ OS_LIBS			= 
  ARCH			= openbsd
  
  DSO_CFLAGS		= -fPIC -DPIC
@@ -36,3 +36,5 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/01/23 12:34:06 wilfried
  DSO_LDFLAGS		=
  
  MKSHLIB			= $(CC) $(DSO_LDOPTS)
+ 
++NSPR_LIBS		= $(shell pkg-config --libs nspr)
diff --git a/mail/mozilla-thunderbird/patches/patch-security_manager_Makefile_in b/mail/mozilla-thunderbird/patches/patch-security_manager_Makefile_in
new file mode 100644
index 00000000000..345b8a1a000
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_manager_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-security_manager_Makefile_in,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/manager/Makefile.in.orig	Thu Jan  5 10:40:17 2006
++++ security/manager/Makefile.in	Tue Nov  7 17:57:02 2006
+@@ -79,7 +79,7 @@ endif
+ # NSS makefiles are not safe for parallel execution.
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+ DEFAULT_GMAKE_FLAGS += CC="$(CC)"
+-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
++DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(NSPR_CFLAGS) -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
+ DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
+ DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_Makefile b/mail/mozilla-thunderbird/patches/patch-security_nss_Makefile
new file mode 100644
index 00000000000..e0fb16181c2
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-security_nss_Makefile,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/Makefile.orig	Tue Nov  7 15:24:56 2006
++++ security/nss/Makefile	Tue Nov  7 15:25:02 2006
+@@ -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)
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_pkiutil_platlibs_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_pkiutil_platlibs_mk
new file mode 100644
index 00000000000..a0badda880b
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_pkiutil_platlibs_mk
@@ -0,0 +1,13 @@
+$OpenBSD: patch-security_nss_cmd_pkiutil_platlibs_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/cmd/pkiutil/platlibs.mk.orig	Tue Nov  7 15:25:17 2006
++++ security/nss/cmd/pkiutil/platlibs.mk	Tue Nov  7 15:25:44 2006
+@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib/ \
+ 	-lnsspki3 \
+ 	-lnss3 \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ 
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_platlibs_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_platlibs_mk
new file mode 100644
index 00000000000..65f7f35ca47
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_cmd_platlibs_mk
@@ -0,0 +1,26 @@
+$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/cmd/platlibs.mk.orig	Tue Nov  7 15:25:57 2006
++++ security/nss/cmd/platlibs.mk	Tue Nov  7 15:26:40 2006
+@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
+ 	$(NULL)
+ else
+ EXTRA_SHARED_LIBS += \
+-	-L$(DIST)/lib \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ endif
+ endif
+@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
+ 	-lssl3 \
+ 	-lsmime3 \
+ 	-lnss3 \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ 
+ JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ckfw_builtins_Makefile b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ckfw_builtins_Makefile
new file mode 100644
index 00000000000..209ecf97e2d
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ckfw_builtins_Makefile
@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_nss_lib_ckfw_builtins_Makefile,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/ckfw/builtins/Makefile.orig	Tue Nov  7 15:26:48 2006
++++ security/nss/lib/ckfw/builtins/Makefile	Tue Nov  7 15:27:43 2006
+@@ -68,8 +68,8 @@ endif
+ else
+ 
+ EXTRA_LIBS += \
+-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++	$(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
++	$(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ 	$(NULL)
+ 
+ endif
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
new file mode 100644
index 00000000000..42fc5df89c2
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig	Tue Nov  7 15:27:57 2006
++++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	Tue Nov  7 15:28:16 2006
+@@ -98,8 +98,8 @@ EXTRA_LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ 	$(CRYPTO_LIB) \
+ 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++	$(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
++	$(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ 	$(NULL)
+ 
+ endif
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_nss_config_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_nss_config_mk
new file mode 100644
index 00000000000..09089346614
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_nss_config_mk
@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_nss_lib_nss_config_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/nss/config.mk.orig	Tue Nov  7 15:28:38 2006
++++ security/nss/lib/nss/config.mk	Tue Nov  7 15:29:02 2006
+@@ -74,9 +74,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib/ \
+ 	-lsoftokn3 \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ 
+ endif
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_smime_config_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_smime_config_mk
new file mode 100644
index 00000000000..122e02552a1
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_smime_config_mk
@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_nss_lib_smime_config_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/smime/config.mk.orig	Tue Nov  7 15:29:15 2006
++++ security/nss/lib/smime/config.mk	Tue Nov  7 15:29:33 2006
+@@ -68,9 +68,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib/ \
+ 	-lnss3 \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH), Darwin)
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_softoken_config_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_softoken_config_mk
new file mode 100644
index 00000000000..2ad242abccc
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_softoken_config_mk
@@ -0,0 +1,15 @@
+$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/softoken/config.mk.orig	Tue Nov  7 15:29:47 2006
++++ security/nss/lib/softoken/config.mk	Tue Nov  7 15:30:06 2006
+@@ -80,10 +80,7 @@ else
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+-	-L$(DIST)/lib/ \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ endif
+ 
diff --git a/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ssl_config_mk b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ssl_config_mk
new file mode 100644
index 00000000000..647342f67d2
--- /dev/null
+++ b/mail/mozilla-thunderbird/patches/patch-security_nss_lib_ssl_config_mk
@@ -0,0 +1,14 @@
+$OpenBSD: patch-security_nss_lib_ssl_config_mk,v 1.1 2006/11/17 19:20:19 kurt Exp $
+--- security/nss/lib/ssl/config.mk.orig	Tue Nov  7 15:30:21 2006
++++ security/nss/lib/ssl/config.mk	Tue Nov  7 15:30:37 2006
+@@ -73,9 +73,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib/ \
+ 	-lnss3 \
+-	-lplc4 \
+-	-lplds4 \
+-	-lnspr4 \
++	$(NSPR_LIBS) \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH), BeOS)
diff --git a/mail/mozilla-thunderbird/pkg/PFRAG.shared b/mail/mozilla-thunderbird/pkg/PFRAG.shared
index 704e77917fa..e31b997937b 100644
--- a/mail/mozilla-thunderbird/pkg/PFRAG.shared
+++ b/mail/mozilla-thunderbird/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2006/01/23 12:34:06 wilfried Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.8 2006/11/17 19:20:19 kurt Exp $
 @lib mozilla-thunderbird/components/libaccessibility.so.${LIBaccessibility_VERSION}
 @lib mozilla-thunderbird/components/libappcomps.so.${LIBappcomps_VERSION}
 @lib mozilla-thunderbird/components/libauth.so.${LIBauth_VERSION}
@@ -57,11 +57,8 @@
 @lib mozilla-thunderbird/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
 @lib mozilla-thunderbird/libldap50.so.${LIBldap50_VERSION}
 @lib mozilla-thunderbird/libmozjs.so.${LIBmozjs_VERSION}
-@lib mozilla-thunderbird/libnspr4.so.${LIBnspr4_VERSION}
 @lib mozilla-thunderbird/libnss3.so.${LIBnss3_VERSION}
 @lib mozilla-thunderbird/libnssckbi.so.${LIBnssckbi_VERSION}
-@lib mozilla-thunderbird/libplc4.so.${LIBplc4_VERSION}
-@lib mozilla-thunderbird/libplds4.so.${LIBplds4_VERSION}
 @lib mozilla-thunderbird/libprldap50.so.${LIBprldap50_VERSION}
 @lib mozilla-thunderbird/libsmime3.so.${LIBsmime3_VERSION}
 @lib mozilla-thunderbird/libsoftokn3.so.${LIBsoftokn3_VERSION}