diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d2f84e3be..b87a1e6f0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-11  Corinna Vinschen  <corinna@vinschen.de>
+
+	* syscalls.cc (sync): Use renamed has_get_volume_pathnames wincap.
+	* wincap.h (wincaps::has_get_volume_pathnames): Rename from
+	has_guid_volumes
+	* wincap.cc: Accomodate above rename throughout.  Set to false on
+	Windows 2000.
+
 2005-04-08  Christopher Faylor  <cgf@timesys.com>
 
 	* pipe.cc (fhandler_pipe::open): Remove O_CREAT limitation.
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 25c4a002a..b49b82445 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -939,7 +939,7 @@ sync ()
 {
   char vol[CYG_MAX_PATH];
   
-  if (wincap.has_guid_volumes ()) /* Win2k and newer */
+  if (wincap.has_get_volume_pathnames ()) /* Win2k and newer */
     {
       HANDLE sh = FindFirstVolumeA (vol, CYG_MAX_PATH);
       if (sh != INVALID_HANDLE_VALUE)
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index 9a790b087..bec5278b2 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -57,7 +57,7 @@ static NO_COPY wincaps wincap_unknown = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_95 = {
@@ -106,7 +106,7 @@ static NO_COPY wincaps wincap_95 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_95osr2 = {
@@ -155,7 +155,7 @@ static NO_COPY wincaps wincap_95osr2 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_98 = {
@@ -204,7 +204,7 @@ static NO_COPY wincaps wincap_98 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_98se = {
@@ -253,7 +253,7 @@ static NO_COPY wincaps wincap_98se = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_me = {
@@ -302,7 +302,7 @@ static NO_COPY wincaps wincap_me = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:true,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_nt3 = {
@@ -351,7 +351,7 @@ static NO_COPY wincaps wincap_nt3 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_nt4 = {
@@ -400,7 +400,7 @@ static NO_COPY wincaps wincap_nt4 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_nt4sp4 = {
@@ -449,7 +449,7 @@ static NO_COPY wincaps wincap_nt4sp4 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:false,
-  has_guid_volumes:false
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_2000 = {
@@ -498,7 +498,7 @@ static NO_COPY wincaps wincap_2000 = {
   has_ioctl_storage_get_media_types_ex:false,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_guid_volumes:true
+  has_get_volume_pathnames:false
 };
 
 static NO_COPY wincaps wincap_xp = {
@@ -547,7 +547,7 @@ static NO_COPY wincaps wincap_xp = {
   has_ioctl_storage_get_media_types_ex:true,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_guid_volumes:true
+  has_get_volume_pathnames:true
 };
 
 static NO_COPY wincaps wincap_2003 = {
@@ -596,7 +596,7 @@ static NO_COPY wincaps wincap_2003 = {
   has_ioctl_storage_get_media_types_ex:true,
   start_proc_suspended:false,
   has_extended_priority_class:true,
-  has_guid_volumes:true
+  has_get_volume_pathnames:true
 };
 
 wincapc wincap;
diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h
index 6d7d63ec9..52c208534 100644
--- a/winsup/cygwin/wincap.h
+++ b/winsup/cygwin/wincap.h
@@ -58,7 +58,7 @@ struct wincaps
   unsigned has_ioctl_storage_get_media_types_ex		: 1;
   unsigned start_proc_suspended				: 1;
   unsigned has_extended_priority_class			: 1;
-  unsigned has_guid_volumes				: 1;
+  unsigned has_get_volume_pathnames			: 1;
 };
 
 class wincapc
@@ -121,7 +121,7 @@ public:
   bool	IMPLEMENT (has_ioctl_storage_get_media_types_ex)
   bool	IMPLEMENT (start_proc_suspended)
   bool	IMPLEMENT (has_extended_priority_class)
-  bool	IMPLEMENT (has_guid_volumes)
+  bool	IMPLEMENT (has_get_volume_pathnames)
 
 #undef IMPLEMENT
 };