diff --git a/ChangeLog b/ChangeLog
index 156b46c14d..1909358e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 28 21:15:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
+
+	* missing/flock.c: workaround for MinGW.
+
 Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* pack.c (pack_unpack): properly ignore non-base64 octets such as
diff --git a/configure.in b/configure.in
index a1e9365d30..950ee8ac4f 100644
--- a/configure.in
+++ b/configure.in
@@ -404,6 +404,7 @@ mingw*)		if test "$with_winsock2" = yes; then
 		rb_cv_binary_elf=no
 		rb_cv_negative_time_t=no
 		enable_pthread=no
+		ac_cv_func_fcntl=yes
 		;;
 os2-emx*)	LIBS="-lm $LIBS"
 		ac_cv_lib_dir_opendir=no;;
diff --git a/missing/flock.c b/missing/flock.c
index ed619f0e91..5f6b41c357 100644
--- a/missing/flock.c
+++ b/missing/flock.c
@@ -1,6 +1,7 @@
 #include "config.h"
 
-#if defined HAVE_FCNTL && defined HAVE_FCNTL_H
+#if defined _WIN32
+#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H
 
 /* These are the flock() constants.  Since this sytems doesn't have
    flock(), the values of the constants are probably not available.
@@ -122,7 +123,7 @@ flock(fd, operation)
         return -1;
     }
 }
-#elif !defined _WIN32
+#else
 int
 flock(fd, operation)
     int fd;