diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk
index 75fe4d60399..ca0804bfeb2 100644
--- a/mozilla/security/coreconf/Linux.mk
+++ b/mozilla/security/coreconf/Linux.mk
@@ -165,7 +165,7 @@ endif
 ARCH			= linux
 
 DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared $(ARCHFLAG)
+DSO_LDOPTS		= -shared $(ARCHFLAG) -z defs
 DSO_LDFLAGS		=
 LDFLAGS			+= $(ARCHFLAG)
 
diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk
index 858e0d97d63..2bc5d72173f 100644
--- a/mozilla/security/coreconf/SunOS5.mk
+++ b/mozilla/security/coreconf/SunOS5.mk
@@ -191,6 +191,7 @@ ifdef NS_USE_GCC
 else
 	DSO_CFLAGS += -KPIC
 endif
+DSO_LDOPTS += -z combreloc -z defs -z ignore
 
 NOSUCHFILE   = /solaris-rm-f-sucks
 
diff --git a/mozilla/security/coreconf/rules.mk b/mozilla/security/coreconf/rules.mk
index 631279e4039..e454fc7fed9 100644
--- a/mozilla/security/coreconf/rules.mk
+++ b/mozilla/security/coreconf/rules.mk
@@ -348,9 +348,9 @@ else
 endif
 else
 ifdef XP_OS2_VACPP
-	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 else
-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
 endif
 	chmod +x $@
 ifeq ($(OS_TARGET),Darwin)