diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9aec7efa0..7b6ba2dcf 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-22  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_disk_file.cc (fhandler_cygdrive::closedir): Return 0 when
+	closing cygdrive_root.
+
 2005-02-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din (basename): Export.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index dab34a453..6171f0b69 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1355,5 +1355,5 @@ fhandler_cygdrive::closedir (DIR *dir)
   if (!iscygdrive_root ())
     return fhandler_disk_file::closedir (dir);
   pdrive = get_win32_name ();
-  return -1;
+  return 0;
 }