diff --git a/config/rules.mk b/config/rules.mk
index 86f6d431d8c9..dd9f05a1b07d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -919,26 +919,25 @@ endif
 
 $(DEF_FILE): $(DEF_OBJS)
 	rm -f $@
-	@cmd /C "echo LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE >$(DEF_FILE)"
-	@cmd /C "echo PROTMODE >>$(DEF_FILE)"
-	@cmd /C "echo CODE    LOADONCALL MOVEABLE DISCARDABLE >>$(DEF_FILE)"
-	@cmd /C "echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >>$(DEF_FILE)"        
-	@cmd /C "echo EXPORTS >>$(DEF_FILE)"
+	echo LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $(DEF_FILE)
+	echo PROTMODE >> $(DEF_FILE)
+	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $(DEF_FILE)
+	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(DEF_FILE)
+	echo EXPORTS >> $(DEF_FILE)
 ifeq ($(IS_COMPONENT),1)
 ifeq ($(HAS_EXTRAEXPORTS),1)
 	$(FILTER) $(DEF_OBJS) >> $(DEF_FILE)
 else
-	@cmd /C "echo    NSGetModule>>$(DEF_FILE)"
+	echo    NSGetModule >> $(DEF_FILE)
 endif
 else
 	$(FILTER) $(DEF_OBJS) >> $(DEF_FILE)
 endif
 	$(ADD_TO_DEF_FILE)
 
-$(IMPORT_LIBRARY): $(OBJS) $(DEF_FILE)
+$(IMPORT_LIBRARY): $(OBJS) $(SHARED_LIBRARY)
 	rm -f $@
-	$(MAKE_DEF_FILE)
-	$(IMPLIB) $@ $(DEF_FILE)
+	$(IMPLIB) $@ $(SHARED_LIBRARY)
 	$(RANLIB) $@
 
 $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in
diff --git a/configure.in b/configure.in
index a0e16d6fc76a..ed08c6282941 100644
--- a/configure.in
+++ b/configure.in
@@ -1273,10 +1273,10 @@ case "$target" in
         CFLAGS="/Q /qlibansi /Gm+ /Su4 /Mp /Tl9"
         CXXFLAGS="/Q /qlibansi /Gm+ /Su4 /Mp /Tl9 /Gx+"
         MOZ_DEBUG_FLAGS="/Ti+"
-        MOZ_OPTIMIZE_FLAGS="/O+ /qtune=pentium /qarch=pentium"
+        MOZ_OPTIMIZE_FLAGS="/O+ /Gl+ /G5 /qarch=pentium"
         LDFLAGS="/NOL /M"
         MOZ_DEBUG_LDFLAGS="/DE"
-        MOZ_OPTIMIZE_LDFLAGS="/EXEPACK:2 /PACKCODE /PACKDATA"
+        MOZ_OPTIMIZE_LDFLAGS="/OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
         DSO_LDOPTS=''
         IMPLIB='implib /NOL /NOI'
         FILTER='cppfilt -q -B -P'