diff --git a/ChangeLog b/ChangeLog
index 6926c7e68e..40ccb04403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-05-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_AT_RANDOM.
+
 	* sysdeps/x86_64/memchr.S: Handle invalid buffer pointers when
 	count is zero.
 
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 97725e7291..473360a13c 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -530,6 +530,11 @@
 # define __ASSUME_FUTEX_CLOCK_REALTIME	1
 #endif
 
+/* Support for the AT_RANDOM auxiliary vector entry was added in 2.6.29.  */
+#if __LINUX_KERNEL_VERSION >= 0x02061d
+# define __ASSUME_AT_RANDOM	1
+#endif
+
 /* Support for preadv and pwritev was added in 2.6.30.  */
 #if __LINUX_KERNEL_VERSION >= 0x02061e
 # define __ASSUME_PREADV	1