diff --git a/ChangeLog b/ChangeLog
index 0890030942..1a868666bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* io/sys/stat.h (fstatat64): Guard prototype with __USE_LARGEFILE64,
+	guard __extern_inline wrapper with __USE_ATFILE instead of __USE_GNU.
+		
 2009-04-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ifaddrs.c: Revert unintended 2008-08-12
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 7d769052a1..c21801d6a9 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -249,9 +249,11 @@ extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__restrict __file,
 #  endif
 # endif
 
+# ifdef __USE_LARGEFILE64
 extern int fstatat64 (int __fd, __const char *__restrict __file,
 		      struct stat64 *__restrict __buf, int __flag)
      __THROW __nonnull ((2, 3));
+# endif
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
@@ -516,7 +518,7 @@ __NTH (fstat64 (int __fd, struct stat64 *__statbuf))
   return __fxstat64 (_STAT_VER, __fd, __statbuf);
 }
 
-#  ifdef __USE_GNU
+#  ifdef __USE_ATFILE
 __extern_inline int
 __NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf,
 		  int __flag))
diff --git a/sysdeps/unix/sysv/linux/sys/personality.h b/sysdeps/unix/sysv/linux/sys/personality.h
index ff7c61aa52..a53a4eea7c 100644
--- a/sysdeps/unix/sysv/linux/sys/personality.h
+++ b/sysdeps/unix/sysv/linux/sys/personality.h
@@ -29,6 +29,8 @@ enum
   {
     ADDR_NO_RANDOMIZE = 0x0040000,
     MMAP_PAGE_ZERO = 0x0100000,
+    ADDR_COMPAT_LAYOUT = 0x0200000,
+    READ_IMPLIES_EXEC = 0x0400000,
     ADDR_LIMIT_32BIT = 0x0800000,
     SHORT_INODE = 0x1000000,
     WHOLE_SECONDS = 0x2000000,