diff --git a/ChangeLog b/ChangeLog
index 84525843fa..825099718a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  9 08:00:15 2011  Luis Lavena  <luislavena@gmail.com>
+
+	* include/ruby/win32.h: undef stat to silence mingw-w64 stat
+	  redefinition warnings (GCC 4.6.3).
+
 Thu Dec  8 23:38:24 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* variable.c (set_const_visibility): clear inine-cache when constant's
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index ea6d3939d0..83da87a45a 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -126,6 +126,7 @@ extern DWORD rb_w32_osid(void);
 #undef fputchar
 #undef utime
 #undef lseek
+#undef stat
 #undef fstat
 #define getc(_stream)		rb_w32_getc(_stream)
 #define getchar()		rb_w32_getc(stdin)