diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 70559a50a5..892ca37c60 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,10 @@
+2012-03-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
+	(__ASSUME_NEW_GETRLIMIT_SYSCALL, __ASSUME_VFORK_SYSCALL): Define
+	for 2.4.12 or later.
+	(__ASSUME_PSELECT, __ASSUME_PPOLL): Only undefine before 3.0.
+
 2012-03-09  Richard Henderson  <rth@twiddle.net>
 
 	* sysdeps/m68k/m680x0/fpu/math_private.h: Use include_next to
diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
index 0c2e120f21..3fffa0801b 100644
--- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
@@ -1,6 +1,6 @@
 /* Set flags signalling availability of kernel features based on given
    kernel version number.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 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
@@ -24,6 +24,8 @@
 # define __ASSUME_STAT64_SYSCALL	1
 # define __ASSUME_FCNTL64		1
 # define __ASSUME_VFORK_SYSCALL		1
+# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1
+# define __ASSUME_VFORK_SYSCALL		1
 #endif
 
 /* Many syscalls were added in 2.6.10 for m68k.  */
@@ -35,6 +37,8 @@
 
 #include_next <kernel-features.h>
 
-/* These syscalls are not implemented yet for m68k.  */
-#undef __ASSUME_PSELECT
-#undef __ASSUME_PPOLL
+/* These syscalls were added only in 3.0 for m68k.  */
+#if __LINUX_KERNEL_VERSION < 0x030000
+# undef __ASSUME_PSELECT
+# undef __ASSUME_PPOLL
+#endif