diff --git a/ChangeLog b/ChangeLog
index 4729a7c5bc..6430c5112e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  5 15:54:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_stat): use STAT macro instead of calling stat() directly.
+	  reported by Bill Kelly.  [ruby-core:30012]
+
 Wed May  5 11:43:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bootstraptest/test_io.rb (megacontent-copy_stream): get rid of
diff --git a/file.c b/file.c
index 80210b8456..f8bbaa71c6 100644
--- a/file.c
+++ b/file.c
@@ -795,7 +795,7 @@ rb_stat(VALUE file, struct stat *st)
     }
     FilePathValue(file);
     file = rb_str_encode_ospath(file);
-    return stat(StringValueCStr(file), st);
+    return STAT(StringValueCStr(file), st);
 }
 
 #ifdef _WIN32