diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index c24096fb6cc..1f4dd45cffb 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.30 2009/08/04 13:56:09 martynas Exp $
+# $OpenBSD: Makefile,v 1.31 2010/03/30 11:47:33 jasper Exp $
 # $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
 
-ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64 hppa
+ONLY_FOR_ARCHS=	alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
 
 COMMENT-main=		Netscape Portable Runtime
 COMMENT-docs=		HTML Documentation for NSPR
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 d6dbf343ee2..ff044371574 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.6 2009/02/14 12:01:48 sthen Exp $
---- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig	Sat Feb 14 00:02:48 2009
-+++ mozilla/nsprpub/pr/include/md/_openbsd.cfg	Sat Feb 14 00:02:50 2009
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.7 2010/03/30 11:47:33 jasper Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig	Mon Nov 26 19:17:17 2007
++++ mozilla/nsprpub/pr/include/md/_openbsd.cfg	Mon Feb  8 16:00:15 2010
 @@ -193,7 +193,7 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
@@ -10,3 +10,62 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_cfg,v 1.6 2009/02/14 12:0
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
+@@ -326,6 +326,58 @@
+ #define PR_ALIGN_OF_FLOAT   4
+ #define PR_ALIGN_OF_DOUBLE  4
+ #define PR_ALIGN_OF_POINTER 4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#elif defined(__mips__)
++
++#ifdef __MIPSEB__
++#define IS_BIG_ENDIAN 1
++#undef  IS_LITTLE_ENDIAN
++#elif defined(__MIPSEL__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
++#error "Unknown MIPS endianness."
++#endif
++
++#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   4
++#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   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
+ 
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
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
index f83c85454ce..afcaea83806 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
@@ -1,16 +1,18 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.7 2009/02/14 12:01:48 sthen Exp $
---- mozilla/nsprpub/pr/include/md/_openbsd.h.orig	Sat May 26 01:13:08 2007
-+++ mozilla/nsprpub/pr/include/md/_openbsd.h	Sat Feb 14 00:30:54 2009
-@@ -56,6 +56,8 @@
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.8 2010/03/30 11:47:33 jasper Exp $
+--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig	Sat May 26 02:13:08 2007
++++ mozilla/nsprpub/pr/include/md/_openbsd.h	Mon Feb  8 16:00:19 2010
+@@ -56,6 +56,10 @@
  #define _PR_SI_ARCHITECTURE "sparc"
  #elif defined(__arm__)
  #define _PR_SI_ARCHITECTURE "arm"
 +#elif defined(__hppa__)
 +#define _PR_SI_ARCHITECTURE "hppa"
++#elif defined(__mips64__) || defined(__mips64el__)
++#define _PR_SI_ARCHITECTURE "mips64"
  #endif
  
  #define PR_DLL_SUFFIX		".so"
-@@ -65,7 +67,11 @@
+@@ -65,7 +69,11 @@
  #define _MD_DEFAULT_STACK_SIZE	65536L
  #define _MD_MMAP_FLAGS          MAP_PRIVATE
  
@@ -22,3 +24,12 @@ $OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.7 2009/02/14 12:01:
  #define HAVE_DLL
  #define USE_DLFCN
  #define _PR_HAVE_SOCKADDR_LEN
+@@ -101,6 +109,8 @@
+ #define JB_SP_INDEX 6
+ #elif defined(__arm__)
+ #define JB_SP_INDEX 23
++#elif defined(__mips64__) || defined(__mips64el__)
++#define JB_SP_INDEX 29
+ #else
+ #error "Need to define SP index in jmp_buf here"
+ #endif
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c
index 13021feb890..c3f37234c02 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c,v 1.1 2009/03/23 00:50:52 jakemsr Exp $
---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	Tue Oct  7 14:45:09 2008
-+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c	Sun Mar 22 01:28:01 2009
-@@ -150,7 +150,11 @@ static PRCallOnceType coOpenDevURandom;
+$OpenBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c,v 1.2 2010/03/30 11:47:33 jasper Exp $
+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	Sat May  2 01:08:05 2009
++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c	Mon Feb  8 16:00:07 2010
+@@ -132,7 +132,11 @@ static PRCallOnceType coOpenDevURandom;
  
  static PRStatus OpenDevURandom( void )
  {