diff --git a/ChangeLog b/ChangeLog
index 97c86fef44..7bee03ecbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* malloc/arena.c [!NO_THREADS]: Use ATFORK_MEM if defined.
+
 2007-10-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/cache.c (prune_cache): Move test for modified file outside
diff --git a/malloc/arena.c b/malloc/arena.c
index ce64335567..4cbb4dc307 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -160,6 +160,10 @@ static void           (*save_free_hook) (__malloc_ptr_t __ptr,
 					 __const __malloc_ptr_t);
 static Void_t*        save_arena;
 
+#ifdef ATFORK_MEM
+ATFORK_MEM;
+#endif
+
 /* Magic value for the thread-specific arena pointer when
    malloc_atfork() is in use.  */