diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 05956e2b338..f7728738132 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2006/09/29 15:59:34 kurt Exp $
+# $OpenBSD: Makefile,v 1.7 2006/11/03 18:02:13 ajacoutot Exp $
 # $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
 
-ONLY_FOR_ARCHS=		i386 powerpc
+ONLY_FOR_ARCHS=		i386 powerpc amd64
 
 COMMENT=		"Netscape Portable Runtime"
 
 VER=			4.4.1
 DISTNAME=		nspr-${VER}
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 SHARED_LIBS=		nspr4	1.0 \
 			plc4	1.0 \
 			plds4	1.0
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
index ac7455e76d5..1b773bd7d35 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.1.1.1 2004/01/29 21:57:53 pvalchev Exp $
---- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig	2004-01-06 21:45:46.000000000 -0500
-+++ mozilla/nsprpub/pr/include/md/_openbsd.cfg	2004-01-06 21:53:01.000000000 -0500
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.2 2006/11/03 18:02:13 ajacoutot Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig	Tue Jun 20 23:23:14 2000
++++ mozilla/nsprpub/pr/include/md/_openbsd.cfg	Fri Nov  3 16:18:29 2006
 @@ -91,9 +91,9 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
@@ -13,10 +13,11 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.1.1.1 2004/01/29
  #define  IS_BIG_ENDIAN 1
  #define HAVE_LONG_LONG
  #define  HAVE_ALIGNED_DOUBLES
-@@ -184,6 +184,53 @@
+@@ -183,6 +183,102 @@
+ 
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
- 
++
 +#elif defined(__sparc_v9__)
 +#undef  IS_LITTLE_ENDIAN
 +#define IS_BIG_ENDIAN 1
@@ -64,6 +65,54 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.1.1.1 2004/01/29
 +#define PR_BYTES_PER_WORD_LOG2  3
 +#define PR_BYTES_PER_DWORD_LOG2 3
 +
++#elif defined(__amd64__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
+ 
  #elif defined(__powerpc__) || defined(__m68k__)
  
- #undef  IS_LITTLE_ENDIAN
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
new file mode 100644
index 00000000000..ed9547901d6
--- /dev/null
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.1 2006/11/03 18:02:13 ajacoutot Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig	Fri Nov  3 16:18:46 2006
++++ mozilla/nsprpub/pr/include/md/_openbsd.h	Fri Nov  3 16:19:04 2006
+@@ -43,6 +43,8 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__powerpc__)