diff --git a/ChangeLog b/ChangeLog
index da45762137..b1ec572709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-10-01  Roland McGrath  <roland@hack.frob.com>
 
+	* io/openat.c [!__ASSUME_ATFCTS] (__have_atfcts): New global variable.
+
 	* sysdeps/unix/sysv/linux/init-first.c: Moved to ...
 	* csu/init-first.c: ... here.
 	* sysdeps/unix/sysv/linux/powerpc/init-first.c: Update #include.
diff --git a/io/openat.c b/io/openat.c
index 92a5769e96..b496539361 100644
--- a/io/openat.c
+++ b/io/openat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -21,6 +21,13 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <kernel-features.h>
+
+/* Some mostly-generic code (e.g. sysdeps/posix/getcwd.c) uses this variable
+   if __ASSUME_ATFCTS is not defined.  */
+#ifndef __ASSUME_ATFCTS
+int __have_atfcts;
+#endif
 
 /* Open FILE with access OFLAG.  Interpret relative paths relative to
    the directory associated with FD.  If OFLAG includes O_CREAT, a