diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b69838538d..79a3ccec61 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/tls.h (TLS_INIT_TP): Also initialize %gs.
+
 2002-02-08  Richard Henderson  <rth@twiddle.net>
 
 	* sysdeps/alpha/elf/pt-initfini.c: Use \n\ for multiline string.
diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index 4d701cc6e8..79e4fde9c7 100644
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -94,6 +94,8 @@ typedef struct
     if (__builtin_expect (result, 0) != 0)				      \
       /* Nothing else we can do.  */					      \
       asm ("hlt");							      \
+									      \
+    asm ("movw %w0, %%gs" : : "q" (7));					      \
   } while (0)