diff --git a/ChangeLog b/ChangeLog
index baaa4f1041..31124430b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	* sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S: New file.
 	* sysdeps/unix/sysv/linux/Versions: Export sched_getcpu for
 	GLIBC_2.6.
+	* sysdeps/unix/sysv/linux/Makefile [subdir=posix] (sysdep_routines):
+	Add sched_getcpu.
 
 2007-04-25  Jakub Jelinek  <jakub@redhat.com>
 
diff --git a/NEWS b/NEWS
index 69414e0203..e8168363b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2007-2-1
+GNU C Library NEWS -- history of user-visible changes.  2007-4-25
 Copyright (C) 1992-2006, 2007 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -7,7 +7,7 @@ using `glibc' in the "product" field.
 
 Version 2.6
 
-* New Linux interfaces: epoll_pwait.
+* New Linux interfaces: epoll_pwait, sched_getcpu.
 
 * New generic interfaces: strerror_l.
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 229611f305..0978e5d5c0 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/x86_64/tls.h (tcbhead_t): Add vgetcpu_cache.
+	* sysdeps/x86_64/tcb-offsets.sym: Add VGETCPU_CACHE_OFFSET.
+
 2007-04-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* tst-locale1.c: Avoid warnings.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 1d9443a5fe..78553b9795 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -112,7 +112,7 @@ endif
 ifeq ($(subdir),posix)
 sysdep_headers += bits/initspin.h
 
-sysdep_routines += exit-thread
+sysdep_routines += exit-thread sched_getcpu
 endif
 
 ifeq ($(subdir),inet)