diff --git a/ChangeLog b/ChangeLog
index 27242dd085..310755bbb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 27 10:05:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (fstat): use _fstati64() instead of fstati64()
+	  on mingw32.
+
 Sat Oct 27 06:28:33 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* object.c (rb_mod_const_get): const_get accepts qualified constant
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index a2eec0cf19..9645cc888d 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -177,7 +177,7 @@ typedef unsigned int uintptr_t;
 #if SIZEOF_OFF_T == 8
 #define off_t __int64
 #define stat stati64
-#define fstat(fd,st)		fstati64(fd,st)
+#define fstat(fd,st)		_fstati64(fd,st)
 #if defined(__BORLANDC__)
 #define stati64(path, st) rb_w32_stati64(path, st)
 #elif !defined(_MSC_VER) || RT_VER < 80