diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b6e1b0aeb..7e97504fa 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (symlink_info::check): Reorder test for nfs symlinks.
+
 2008-05-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Don't try to
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 30688a866..eeb4b8495 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2527,7 +2527,7 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
       /* If the file could be opened with FILE_READ_EA, and if it's on a
 	 NFS share, check if it's a symlink.  Only files can be symlinks
 	 (which can be symlinks to directories). */
-      else if (!no_ea && !(fileattr & FILE_ATTRIBUTE_DIRECTORY) && fs.is_nfs ())
+      else if (fs.is_nfs () && !no_ea && !(fileattr & FILE_ATTRIBUTE_DIRECTORY))
 	{
 	  res = check_nfs_symlink (h);
 	  if (!res)