diff --git a/ChangeLog b/ChangeLog
index b5d68f844e..4e92ab33d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 21 16:14:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set ac_cv_func__setjump to "no" on Cygwin.
+
+	* configure.in: set ac_cv_func_crypt to "no" on MinGW.
+
 Tue Aug 20 21:47 2002  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
 
 	* io.c          (rb_io_fread): remove case EPIPE on bcc32 .
diff --git a/configure.in b/configure.in
index a711c93354..a457dba58a 100644
--- a/configure.in
+++ b/configure.in
@@ -208,7 +208,8 @@ darwin*)	LIBS="-lobjc $LIBS";;
 human*)		ac_cv_func_getpgrp_void=yes;;
 beos*)		;;
 cygwin*)	rb_cv_have_daylight=no
-		ac_cv_var_tzname=no;;
+		ac_cv_var_tzname=no
+		ac_cv_func__setjmp=no;;
 mingw*)		LIBS="-lwsock32 -lmsvcrt $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
@@ -223,6 +224,7 @@ mingw*)		LIBS="-lwsock32 -lmsvcrt $LIBS"
 		ac_cv_func_vsnprintf=yes
 		ac_cv_func_seekdir=yes
 		ac_cv_func_telldir=yes
+		ac_cv_func_crypt=no
 		;;
 os2_emx*)	LIBS="-lm $LIBS"
 		ac_cv_lib_dir_opendir=no;;