diff --git a/ChangeLog b/ChangeLog
index 8f3a36b342..70c1183c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Fri Jul 23 15:05:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 23 15:09:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): ignore msvc suffix.
 
 	* configure.in (RUBY_TRY_CFLAGS): try with werror turned on.
 
diff --git a/configure.in b/configure.in
index ee92b9e2d1..ebc62821ac 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,9 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 ], rb_cv_mingw32=yes,rb_cv_mingw32=no)
 rm -f conftest*])
 test "$rb_cv_mingw32" = yes && target_os="mingw32"
+  ])
+AS_CASE(["$target_os"], [mingw*msvc], [
+target_os="`echo ${target_os} | sed 's/msvc$//'`"
   ])])
 
 AC_DEFUN([RUBY_CPPOUTFILE],