diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index f2414107f..dce5dbd92 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-09  Christopher Faylor  <cgf@redhat.com>
+
+	* mount.cc (main): Use default system/user flag for cygdrive stuff,
+	too.
+	(change_cygdrive_prefix): Change MOUNT_AUTO to MOUNT_CYGDRIVE.
+	* umount.cc (remove_cygdrive_prefix): Ditto.
+	(main): Use default system/user flag for cygdrive stuff, too.
+
 2002-06-08  Christopher Faylor  <cgf@redhat.com>
 
 	* mount.cc (opts): Remove '-i' option.
diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc
index 7c2f2a172..cd3131028 100644
--- a/winsup/utils/mount.cc
+++ b/winsup/utils/mount.cc
@@ -275,7 +275,7 @@ main (int argc, char **argv)
     case saw_change_cygdrive_prefix:
       if (optind != argc)
 	usage ();
-      change_cygdrive_prefix (argv[optind], flags);
+      change_cygdrive_prefix (argv[optind], flags | default_flag);
       break;
     case saw_show_cygdrive_prefix:
       if (optind <= argc)
@@ -436,7 +436,7 @@ mount_already_exists (const char *posix_path, int flags)
 static void
 change_cygdrive_prefix (const char *new_prefix, int flags)
 {
-  flags |= MOUNT_AUTO;
+  flags |= MOUNT_CYGDRIVE;
 
   if (mount (NULL, new_prefix, flags))
     error (new_prefix);
diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc
index cd508a5e1..afcee5ee7 100644
--- a/winsup/utils/umount.cc
+++ b/winsup/utils/umount.cc
@@ -160,7 +160,7 @@ main (int argc, char **argv)
     case saw_remove_cygdrive_prefix:
       if (optind != argc)
 	usage ();
-      remove_cygdrive_prefix (flags);
+      remove_cygdrive_prefix (flags | default_flag);
       break;
     case saw_remove_all_system_mounts:
       if (optind != argc)
@@ -244,7 +244,7 @@ remove_all_system_mounts ()
 static void
 remove_cygdrive_prefix (int flags)
 {
-  int res = cygwin_umount (NULL, flags | MOUNT_AUTO);
+  int res = cygwin_umount (NULL, flags | MOUNT_CYGDRIVE);
   if (res)
     error ("remove_cygdrive_prefix");
   exit (0);