diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 3b814544791..fa44becb16a 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -568,15 +568,11 @@ libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY)
 ifndef NO_DIST_INSTALL
 ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
 ifdef LIBRARY
-ifeq ($(OS_ARCH),OS2)
-	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
-else
 ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib/$(COMPONENTS_PATH)
 else
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
 endif
-endif # OS2
 endif # LIBRARY
 endif # BUILD_STATIC_LIBS || FORCE_STATIC_LIB
 ifdef MAPS
diff --git a/mozilla/config/static-config.mk b/mozilla/config/static-config.mk
index db05998bbd6..73f4d5ff25f 100644
--- a/mozilla/config/static-config.mk
+++ b/mozilla/config/static-config.mk
@@ -31,11 +31,7 @@ STATIC_REQUIRES += \
 	string \
 	$(NULL)
 
-ifeq ($(OS_ARCH),OS2)
-STATIC_EXTRA_DSO_LIBS += $(addprefix lib,$(shell cat $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS)))
-STATIC_EXTRA_LIBS += libuls.lib libconv.lib unikbd.lib
-else
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 STATIC_EXTRA_LIBS += \
 	$(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/components/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_COMPS)))) \
 	$(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_LIBS)))) \
@@ -43,8 +39,7 @@ STATIC_EXTRA_LIBS += \
 else
 STATIC_EXTRA_LIBS += -L$(DIST)/lib/components
 STATIC_EXTRA_DSO_LIBS += $(shell cat $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS))
-endif # WINNT
-endif # OS2
+endif # OS2 || WINNT
 
 STATIC_COMPONENT_LIST := $(shell cat $(FINAL_LINK_COMP_NAMES))
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 3e5ef461a52..20588332b4e 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -235,6 +235,11 @@ endif
 ifeq ($(OS_ARCH),OS2)
 ifdef BUILD_STATIC_LIBS
 EXE_DEF_FILE = mozilla.def
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+OS_LIBS += libuls.lib libconv.lib
+else
+OS_LIBS += -llibuni -luconv
+endif
 endif
 endif
 
@@ -318,7 +323,8 @@ $(EXE_DEF_FILE):
 	@echo 	WinQueryProperty		= PMMERGE.5450 >>$(EXE_DEF_FILE)
 	@echo 	WinRemoveProperty		= PMMERGE.5451 >>$(EXE_DEF_FILE)
 	@echo 	WinSetProperty			= PMMERGE.5452 >>$(EXE_DEF_FILE)
-	@echo  	DaxOpenSave					= PMCTLS.295   >>$(EXE_DEF_FILE)
+	
+LDFLAGS += /NOE
 endif
 endif
 
diff --git a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
index 210eed81bb0..f421956479a 100644
--- a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
+++ b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
@@ -62,7 +62,7 @@ static nsStaticModuleInfo gStaticModuleInfo[] = {
 /**
  * Our NSGetStaticModuleInfoFunc
  */
-nsresult
+nsresult PR_CALLBACK
 app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count)
 {
   *info = gStaticModuleInfo;