diff --git a/ChangeLog b/ChangeLog
index abb3830a33..a3ef3ae018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* malloc/arena.c (ptmalloc_unlock_all2): Reset atfork_arena_ptr.
+
 2005-10-08  Jakub Jelinek  <jakub@redhat.com>
 
 	* nss/getent.c (hosts_keys): Pass INADDRSZ as size rather
diff --git a/malloc/arena.c b/malloc/arena.c
index a844392a6b..039d70ff18 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -277,7 +277,7 @@ ptmalloc_unlock_all (void)
 
 #ifdef __linux__
 
-/* In LinuxThreads, unlocking a mutex in the child process after a
+/* In NPTL, unlocking a mutex in the child process after a
    fork() is currently unsafe, whereas re-initializing it is safe and
    does not leak resources.  Therefore, a special atfork handler is
    installed for the child. */
@@ -300,6 +300,7 @@ ptmalloc_unlock_all2 (void)
     if(ar_ptr == &main_arena) break;
   }
   mutex_init(&list_lock);
+  atfork_recursive_cntr = 0;
 }
 
 #else