diff --git a/config/ChangeLog b/config/ChangeLog
index 8e98f6d13..87af62b4e 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-02  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* mh-cygwin (LDFLAGS): Turn up stack allocation to 12MB.
+	(BOOT_LDFLAGS): Add matching stack size flag.
+	* mh-mingw (LDFLAGS): Likewise.
+	(BOOT_LDFLAGS): Likewise.
+
 2010-11-27  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* bootstrap-lto.mk (BOOT_ADAFLAGS): Delete.
diff --git a/config/mh-cygwin b/config/mh-cygwin
index 3a9698b38..e3f732503 100644
--- a/config/mh-cygwin
+++ b/config/mh-cygwin
@@ -1,8 +1,10 @@
 EXTRA_TARGET_HOST_ALL_MODULES=maybe-all-libtermcap
 EXTRA_TARGET_HOST_INSTALL_MODULES=maybe-install-libtermcap
 
-# Increase stack limit to same as Linux default.
-LDFLAGS += -Wl,--stack,8388608
+# Increase stack limit to a figure based on the Linux default, with 4MB added
+# as GCC turns out to need that much more to pass all the limits-* tests.
+LDFLAGS += -Wl,--stack,12582912
+BOOT_LDFLAGS += -Wl,--stack,12582912
 
 all-gdb: maybe-all-libtermcap
 
diff --git a/config/mh-mingw b/config/mh-mingw
index d91323ef5..bc1d27477 100644
--- a/config/mh-mingw
+++ b/config/mh-mingw
@@ -2,5 +2,7 @@
 # Vista (see PR33281 for details).
 BOOT_CFLAGS += -D__USE_MINGW_ACCESS -Wno-pedantic-ms-format
 CFLAGS += -D__USE_MINGW_ACCESS
-# Increase stack limit to same as Linux default.
-LDFLAGS += -Wl,--stack,8388608
+# Increase stack limit to a figure based on the Linux default, with 4MB added
+# as GCC turns out to need that much more to pass all the limits-* tests.
+LDFLAGS += -Wl,--stack,12582912
+BOOT_LDFLAGS += -Wl,--stack,12582912