diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 2d7517bc8bf..825d3e8a848 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -519,6 +519,17 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
 endif
 endif 
 
+#
+# MINGW32
+#
+ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+ifndef IS_COMPONENT
+DSO_LDOPTS += -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
+endif
+endif
+endif
+
 ifeq ($(USE_TVFS),1)
 IFLAGS1 = -rb
 IFLAGS2 = -rb
diff --git a/mozilla/configure.in b/mozilla/configure.in
index ca254613928..a71941a3077 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -984,7 +984,7 @@ case "$target" in
         CXX="$CXX -mno-cygwin"
         CFLAGS="$CFLAGS -mms-bitfields"
         CXXFLAGS="$CXXFLAGS -mms-bitfields"
-        DSO_LDOPTS='-shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)'
+        DSO_LDOPTS='-shared'
         MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
         MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
         RC='$(CYGWIN_WRAPPER) $(WINDRES)'