diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 942abb43f..19b8c0f12 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* external.cc (cygwin_internal): In CW_CVT_MNT_OPTS case, initialize
+	flags with *pflags to restore original behaviour.
+
 2010-08-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.in (DLL_IMPORTS): Link against advapi32.a before kernel32.a.
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index e8d3580f4..7b26eefa0 100644
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -507,7 +507,7 @@ cygwin_internal (cygwin_getinfo_types t, ...)
 	  else
 	    {
 	      unsigned *pflags = va_arg (arg, unsigned *);
-	      unsigned flags = 0;
+	      unsigned flags = pflags ? *pflags : 0;
 	      if (fstab_read_flags (option_string, flags, true))
 		{
 		  if (pflags)