diff --git a/mozilla/js/src/Makefile b/mozilla/js/src/Makefile
index e6f9fe798c8..f2e178a19f1 100644
--- a/mozilla/js/src/Makefile
+++ b/mozilla/js/src/Makefile
@@ -120,13 +120,14 @@ JSJAVA_STUBHEADERS = -I$(DEPTH)/sun-java/include/_gen \
 else
 JSJAVA_STUBHEADERS = -I$(JRI_GEN_DIR) -I$(JDK_GEN_DIR)
 endif
-LDFLAGS		= $(DIST)/lib/libnspr.$(LIB_SUFFIX) -lm 
 
 JSJAVA_CFLAGS	= -I$(DEPTH)/sun-java/md-include \
 		  -I$(DEPTH)/sun-java/include \
 		  $(JSJAVA_STUBHEADERS)
 
-LDFLAGS		= $(DIST)/lib/libnspr.$(LIB_SUFFIX) -lm
+# LIBNSPR includes unneeded libmsgc21.a, but abstracts nspr version,
+# etc. nicely.
+LDFLAGS 	= $(LIBNSPR) -lm
 
 ifeq ($(OS_ARCH), OSF1)
 LDFLAGS += -lc_r
@@ -134,6 +135,9 @@ endif
 ifeq ($(OS_ARCH), SunOS)
 LDFLAGS += -lposix4 -ldl -lnsl -lsocket
 endif
+ifeq ($(OS_ARCH), Linux)
+LDFLAGS += -ldl
+endif
 
 # this requires clobbering and recompiling with XCFLAGS=-DJSFILE
 js: