diff --git a/ChangeLog b/ChangeLog
index 1c13325697..55ceaf0ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Mar  4 23:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar  4 23:41:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
+	  rb_gid_t instead of int.
 
 	* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
 	  where utimes() does not exist.
diff --git a/file.c b/file.c
index 57c7adaa5c..9ef9ad7223 100644
--- a/file.c
+++ b/file.c
@@ -351,7 +351,7 @@ rb_stat_nlink(VALUE self)
 static VALUE
 rb_stat_uid(VALUE self)
 {
-    return UINT2NUM(get_stat(self)->st_uid);
+    return UIDT2NUM(get_stat(self)->st_uid);
 }
 
 /*
@@ -367,7 +367,7 @@ rb_stat_uid(VALUE self)
 static VALUE
 rb_stat_gid(VALUE self)
 {
-    return UINT2NUM(get_stat(self)->st_gid);
+    return GIDT2NUM(get_stat(self)->st_gid);
 }
 
 
@@ -828,7 +828,7 @@ eaccess(const char *path, int mode)
 {
 #ifdef USE_GETEUID
     struct stat st;
-    int euid;
+    rb_uid_t euid;
 
     if (stat(path, &st) < 0) return -1;