diff --git a/ChangeLog b/ChangeLog
index 142ee2cfba..74fc39079d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
+
+	* configure.in: set ac_cv_header_sys_time_h=no on MinGW
+	  for msvcrt compatibility.
+
 Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
diff --git a/configure.in b/configure.in
index e9fcc2fb24..14da1a5e65 100644
--- a/configure.in
+++ b/configure.in
@@ -361,6 +361,7 @@ mingw*)		LIBS="-lshell32 -lws2_32 $LIBS"
 		ac_cv_header_sys_param_h=no
 		ac_cv_header_sys_resource_h=no
 		ac_cv_header_sys_select_h=no
+		ac_cv_header_sys_time_h=no
 		ac_cv_header_sys_times_h=no
 		ac_cv_func_times=yes
 		ac_cv_func_waitpid=yes
diff --git a/win32/win32.h b/win32/win32.h
index 7991996db2..477937bbdd 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -157,6 +157,8 @@ struct timezone {
   int tz_minuteswest;
   int tz_dsttime;
 };
+#undef isascii
+#define isascii __isascii
 #endif
 extern void   NtInitialize(int *, char ***);
 extern int    rb_w32_cmdvector(const char *, char ***);