diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ef7fa4d04..f51753725 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-12  Corinna Vinschen  <vinschen@redhat.com>
+
+	* mount.cc (fs_info::update): Set has_buggy_reopen for Netapps as well.
+
 2011-12-12  Corinna Vinschen  <vinschen@redhat.com>
 	    Christopher Faylor  <me.cygwin2011@cgf.cx>
 
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 895592525..bfb63f801 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -393,10 +393,10 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
 	     away since at least some of them are not capable either. */
 	  has_dos_filenames_only (is_netapp () || is_nwfs ()
 				  || is_ncfsd () || is_cifs ());
-	  /* NWFS does not grok re-opening a file by handle.  It only
-	     supports this if the filename is non-null and the handle is
+	  /* Netapp and NWFS don't grok re-opening a file by handle.  They
+	     only support this if the filename is non-null and the handle is
 	     the handle to a directory. NcFsd IR10 is supposed to be ok. */
-	  has_buggy_reopen (is_nwfs ());
+	  has_buggy_reopen (is_netapp () || is_nwfs ());
 	}
     }
   if (!got_fs ()