diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a6b39b28c..e5bb70a90 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* syscalls.cc (fstatat): Call stat_worker directly from here.
+
 2010-09-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* flock.cc (allow_others_to_sync): Define MAX_PROCESS_SD_SIZE.  Use
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 2d0cdc36c..5c1ec504b 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -4153,7 +4153,10 @@ fstatat (int dirfd, const char *pathname, struct __stat64 *st, int flags)
   char *path = tp.c_get ();
   if (gen_full_path_at (path, dirfd, pathname))
     return -1;
-  return (flags & AT_SYMLINK_NOFOLLOW) ? lstat64 (path, st) : stat64 (path, st);
+  path_conv pc (path, ((flags & AT_SYMLINK_NOFOLLOW)
+		       ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW)
+		      | PC_POSIX | PC_KEEP_HANDLE, stat_suffixes);
+  return stat_worker (pc, st);
 }
 
 extern int utimens_worker (path_conv &, const struct timespec *);