diff --git a/ChangeLog b/ChangeLog
index c581968ad5..00f04dd026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sun Nov 27 18:54:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 27 19:09:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (stack_protector): disable on mingw.  [Bug#5676]
 
 	* Makefile.in (DLDFLAGS): also needs -fstack-protector.
 	  [Bug#5676]
diff --git a/configure.in b/configure.in
index 9df6ad6bac..a57cec93a1 100644
--- a/configure.in
+++ b/configure.in
@@ -497,7 +497,13 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
 fi
 if test "$GCC" = yes; then
     RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-    RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	stack_protector=no
+    ],
+    [
+	RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
+    ])
     if test "x$stack_protector" = xyes; then
 	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
 	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)