diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 322b09cc29..5b2f6c69d7 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/pthread/bits/libc-lock.h (__libc_locking_needed): Only
+	declare for libc.so.
+	(__libc_lock_init, __libc_lock_init_recursive): Change into comma
+	expression.
+	(__libc_lock_lock): Put into statement expression.
+	(__libc_lock_unlock): Remove trailing semicolon.
+	* sysdeps/unix/sysv/linux/fork.h (__libc_pthread_init): Fix typo.
+
 2002-12-12  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Use asm operand with
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.h b/nptl/sysdeps/unix/sysv/linux/fork.h
index 0bc283d1bc..f2899225b8 100644
--- a/nptl/sysdeps/unix/sysv/linux/fork.h
+++ b/nptl/sysdeps/unix/sysv/linux/fork.h
@@ -56,5 +56,5 @@ extern int __register_atfork (void (*__prepare) (void),
 			      void *dso_handle);
 
 /* Register the generation counter in the libpthread with the libc.  */
-extern void __libc_pthread_int (unsigned long int *__ptr,
-				void (*reclaim) (void));
+extern void __libc_pthread_init (unsigned long int *__ptr,
+				 void (*reclaim) (void));