diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3b63d459e..1c55f5180 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Use UINT32_MAX
+	instead of UINT_MAX.
+
 2006-04-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (path_conv::hasgood_inode): Make inline.
@@ -7,7 +12,7 @@
 	(fhandler_disk_file::opendir): Reformat comment.
 	(fhandler_base::fstat_helper): Special case remote file systems
 	returning (unreliable) 32 bit inode numbers.
-	(fhandler_base::readdir): Ditto.
+	(fhandler_disk_file::readdir): Ditto.
 	* fhandler_netdrive.cc (fhandler_netdrive::readdir): Ditto.
 
 2006-04-13  Christopher Faylor  <cgf@timesys.com>
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index ecbbc3ebd..04f312b8a 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1791,7 +1791,7 @@ fhandler_disk_file::readdir (DIR *dir, dirent *de)
 	  /* We can't trust remote inode numbers of only 32 bit.  That means,
 	     all remote inode numbers when running under NT4, as well as
 	     remote NT4 NTFS, as well as shares of Samba version < 3.0. */
-	  if (de->d_ino <= UINT_MAX && pc.isremote ())
+	  if (de->d_ino <= UINT32_MAX && pc.isremote ())
 	    {
 	      dir->__flags &= ~dirent_set_d_ino;
 	      de->d_ino = 0;