diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index cc4f714e4b0..cf7b5c0b65d 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -857,7 +857,7 @@ ifndef IS_COMPONENT
 	fi
 	@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)
 endif
-	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) VMSuni.opt;
+	$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(EXTRA_LIBS) VMSuni.opt;
 endif
 else # OS2
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 748c47c1192..c57100e1d59 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -843,6 +843,8 @@ case "$target" in
     AC_DEFINE(NO_UDSOCK)
     AC_DEFINE(POLL_WITH_XCONNECTIONNUMBER)
     USE_PTHREADS=1
+    MKSHLIB_FORCE_ALL='-all'
+    MKSHLIB_UNFORCE_ALL='-none'
     ;;
 
 
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 395b19fa0cd..9c108b1c51b 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -112,12 +112,6 @@ LOCAL_INCLUDES += -I$(DIST)/public/security \
                   -I$(DIST)/private/security \
                   $(NULL)
 
-
-ifeq ($(OS_ARCH),OpenVMS)
-# OpenVMS wants the link libs in EXTRA_DSO_LDOPTS, with no dups
-EXTRA_DSO_LDOPTS += $(sort $(EXTRA_LIBS))
-endif
-
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \