diff --git a/ChangeLog b/ChangeLog
index f7d344f9c2..f089827ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-12-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/libc_fatal.c: New file.
+
 	* sysdeps/generic/sysdep-cancel.h: Add dummy definitions for
 	SINGLE_THREAD_P, LIBC_CANCEL_ASYNC, and LIBC_CANCEL_RESET.
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2296c17803..7dc9523530 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2002-12-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/i386/createthread.c (create_thread): Set
+	multiple_threads member in correct TCB to 1.
+
 	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Define
 	SINGLE_THREAD_P.  If in libc or libpthread examine multiple_thread
 	member of thread decriptor, otherwise return unconditionally 1.
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c b/nptl/sysdeps/unix/sysv/linux/i386/createthread.c
index f9abce2df2..be2ca829ab 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c
+++ b/nptl/sysdeps/unix/sysv/linux/i386/createthread.c
@@ -146,7 +146,7 @@ create_thread (struct pthread *pd, STACK_VARIABLES_PARMS)
     return errno;
 
   /* We now have for sure more than one thread.  */
-  pd->header.data.multiple_threads = 1;
+  THREAD_SETMEM (THREAD_SELF, header.data.multiple_threads, 1);
 
   return 0;
 }
diff --git a/sysdeps/unix/sysv/linux/libc_fatal.c b/sysdeps/unix/sysv/linux/libc_fatal.c
new file mode 100644
index 0000000000..5043f62880
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/libc_fatal.c
@@ -0,0 +1,57 @@
+/* Copyright (C) 1993,1994,1995,1997,2000,2002 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sysdep.h>
+#include <string.h>
+#include <abort-instr.h>
+#ifndef ABORT_INSTRUCTION
+/* No such instruction is available.  */
+# define ABORT_INSTRUCTION
+#endif
+
+/* Abort with an error message.  */
+void
+__libc_fatal (message)
+     const char *message;
+{
+  size_t len = strlen (message);
+
+  while (len > 0)
+    {
+      ssize_t count = INLINE_SYSCALL (write, 3, STDERR_FILENO, message, len);
+      if (count > 0)
+	{
+	  message += count;
+	  len -= count;
+	}
+      else if (count < 0 && errno != EINTR)
+	break;
+    }
+
+  /* Terminate the process.  */
+  _exit (127);
+
+  /* The previous call should never have returned.  */
+  while (1)
+    /* Try for ever and ever.  */
+    ABORT_INSTRUCTION;
+}