diff --git a/ChangeLog b/ChangeLog
index f5d656a4ed..8bec936b18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 09:43:19 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_flock): using flock defined in
+	  win32/win32.c on mingw.
+
 Fri Feb 13 01:45:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_set_sequence, compile_dstr_fragments),
diff --git a/configure.in b/configure.in
index 5c5ce548c0..f8f2152206 100644
--- a/configure.in
+++ b/configure.in
@@ -707,6 +707,7 @@ when(mingw*)	LIBS="-lshell32 -lws2_32 $LIBS"
 		rb_cv_binary_elf=no
 		rb_cv_negative_time_t=no
 		ac_cv_func_fcntl=yes
+		ac_cv_func_flock=yes
 		AC_LIBOBJ([langinfo])
 		;;
 when(os2-emx*)	LIBS="-lm $LIBS"