diff --git a/mozilla/db/mork/build/Makefile.in b/mozilla/db/mork/build/Makefile.in
index 07dc2ed38b0..80fd87ce94f 100644
--- a/mozilla/db/mork/build/Makefile.in
+++ b/mozilla/db/mork/build/Makefile.in
@@ -36,15 +36,16 @@ EXPORTS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.a
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lxp \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lxp \
+		-lmsgbaseutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in
index a827f6a0cbd..5039bd7ca1a 100644
--- a/mozilla/mailnews/base/build/Makefile.in
+++ b/mozilla/mailnews/base/build/Makefile.in
@@ -43,6 +43,7 @@ EXTRA_DSO_LDOPTS = \
 		-lxpcom \
 		-lmozreg \
 		-lmsgbaseutil \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in
index 38926aa8897..1b7e27ac2ab 100644
--- a/mozilla/mailnews/compose/build/Makefile.in
+++ b/mozilla/mailnews/compose/build/Makefile.in
@@ -46,6 +46,7 @@ EXTRA_DSO_LDOPTS = \
 		-lappcores \
 		-lmsgbaseutil \
 		-lraptorhtmlpars \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/db/mork/build/Makefile.in b/mozilla/mailnews/db/mork/build/Makefile.in
index 07dc2ed38b0..80fd87ce94f 100644
--- a/mozilla/mailnews/db/mork/build/Makefile.in
+++ b/mozilla/mailnews/db/mork/build/Makefile.in
@@ -36,15 +36,16 @@ EXPORTS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.a
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lxp \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lxp \
+		-lmsgbaseutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/db/msgdb/build/Makefile.in b/mozilla/mailnews/db/msgdb/build/Makefile.in
index 0c213a3f876..6555d18727e 100644
--- a/mozilla/mailnews/db/msgdb/build/Makefile.in
+++ b/mozilla/mailnews/db/msgdb/build/Makefile.in
@@ -32,15 +32,16 @@ EXPORTS		= nsMsgDBCID.h
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgdb_s.a
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(SHARED_LIBRARY_LIBS) \
-	$(MKSHLIB_UNFORCE_ALL) \
-	-L$(DIST)/bin \
-	-L$(DIST)/lib \
-	-lxpcom \
-	-lxp \
-	-lmsgbaseutil \
-	$(NULL)
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lxp \
+		-lmsgbaseutil \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in
index 64a8444b827..0a961e7346f 100644
--- a/mozilla/mailnews/imap/build/Makefile.in
+++ b/mozilla/mailnews/imap/build/Makefile.in
@@ -43,6 +43,7 @@ EXTRA_DSO_LDOPTS = \
 		-lmozreg \
 		-lrdfutil_s \
 		-lmsgbaseutil \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in
index 53fa8e3f068..0c8a82d85a3 100644
--- a/mozilla/mailnews/local/build/Makefile.in
+++ b/mozilla/mailnews/local/build/Makefile.in
@@ -43,6 +43,7 @@ EXTRA_DSO_LDOPTS = \
 		-lxpcom \
 		-lmozreg \
 		-lmsgbaseutil \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/news/build/Makefile.in b/mozilla/mailnews/news/build/Makefile.in
index 006b3cd2537..f69d89e0109 100644
--- a/mozilla/mailnews/news/build/Makefile.in
+++ b/mozilla/mailnews/news/build/Makefile.in
@@ -41,6 +41,7 @@ EXTRA_DSO_LDOPTS = \
 		-lxpcom \
 		-lmozreg \
 		-lmsgbaseutil \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk