diff --git a/mozilla/build/unix/nspr_my_overrides.mk.in b/mozilla/build/unix/nspr_my_overrides.mk.in
index 906ee8265df..cc9ac3132d0 100644
--- a/mozilla/build/unix/nspr_my_overrides.mk.in
+++ b/mozilla/build/unix/nspr_my_overrides.mk.in
@@ -1 +1,7 @@
 DIST=@MOZ_NSPRENV_DIST@
+MOZ_NSPRENV_OVERRIDE_MAKE=@MOZ_NSPRENV_OVERRIDE_MAKE@
+
+ifdef MOZ_NSPRENV_OVERRIDE_MAKE
+MAKE=$(MOZ_NSPRENV_OVERRIDE_MAKE)
+endif
+
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 0856aad0208..81d7dfb1cb6 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -1832,6 +1832,21 @@ dnl Where the NSPR sutff gets installed: $DIST/{bin,lib,include}
 dnl 
 MOZ_NSPRENV_DIST=`pwd`/dist
 
+dnl 
+dnl MAKE
+dnl
+dnl NSPR is not safe for gnu make -jX (where X > 1) builds.  Force make
+dnl in NSPR to be 'make -j1' - or just 'make'
+dnl 
+dnl Only set this if 'make' is found.
+
+_make_try=`make -v 2> /dev/null`
+
+if test "$_make_try"
+then
+	MOZ_NSPRENV_OVERRIDE_MAKE=make
+fi
+
 AC_SUBST(MOZ_NSPRENV_USE_PTHREADS)
 AC_SUBST(MOZ_NSPRENV_BUILD_OPT)
 AC_SUBST(MOZ_NSPRENV_NS_USE_GCC)
@@ -1839,6 +1854,7 @@ AC_SUBST(MOZ_NSPRENV_NO_MDUPDATE)
 AC_SUBST(MOZ_NSPRENV_NS_USE_NATIVE)
 AC_SUBST(MOZ_NSPRENV_MOZILLA_CLIENT)
 AC_SUBST(MOZ_NSPRENV_DIST)
+AC_SUBST(MOZ_NSPRENV_OVERRIDE_MAKE)
 fi
 dnl ========================================================