diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b16fe59c9..7d7d6acf8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-13  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mount.cc (fillout_mntent): Always print noumount option last.
+
 2008-08-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mount.cc (fillout_mntent): Print options as taken in fstab and mount.
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index c4914e37e..f9e65b10f 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1177,12 +1177,12 @@ fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
   if (flags & MOUNT_NOPOSIX)
     strcat (_my_tls.locals.mnt_opts, (char *) ",posix=0");
 
-  if ((flags & MOUNT_CYGDRIVE))		/* cygdrive */
-    strcat (_my_tls.locals.mnt_opts, (char *) ",noumount");
-
   if (!(flags & MOUNT_SYSTEM))		/* user mount */
     strcat (_my_tls.locals.mnt_opts, (char *) ",user");
 
+  if ((flags & MOUNT_CYGDRIVE))		/* cygdrive */
+    strcat (_my_tls.locals.mnt_opts, (char *) ",noumount");
+
   ret.mnt_opts = _my_tls.locals.mnt_opts;
 
   ret.mnt_freq = 1;