diff --git a/ChangeLog b/ChangeLog
index ed17d6c7d4..4d3d4676bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 19 01:48:05 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in: add -static-libgcc for mingw automatically if available.
+
 Thu Nov 19 00:53:26 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/extmk.rb (--extflags): new option to pass EXTLDFLAGS to children,
diff --git a/configure.in b/configure.in
index ad417af99f..d3d82310ad 100644
--- a/configure.in
+++ b/configure.in
@@ -944,6 +944,10 @@ if test "$GCC" = yes; then
 
     AS_CASE(["$target_os"], [mingw*], [
 	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
+	RUBY_TRY_CFLAGS(-static-libgcc, [static_libgcc=yes], [static_libgcc=no])
+	if test "$static_libgcc" = yes; then
+	    RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc)
+	fi
     ])
 
     # disable fast-math