diff --git a/ChangeLog b/ChangeLog
index 5c3c53a092..b9e5ea2651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* manual/examples/dir.c: Don't include <stddef.h>.
+	* manual/examples/select.c: Include <errno.h> for TEMP_FAILURE_RETRY.
+	Reported by Frédéric Delanoy <delanoy_f@yahoo.com>.
+
+2002-11-02  H.J. Lu  <hjl@gnu.org>
+
+	* stdio-common/reg-printf.c: Include <stddef.h>.
+
 2002-11-03  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/generic/libc-tls.c: Define _dl_tls_static_used.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1e069044ee..8569a3713b 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/useldt.h [PIC] (USETLS_LOAD_EBX): Use correct input
+	register number.
+	(DO_SET_THREAD_AREA): Mark asm output specifiers correctly.
+
 2002-10-22  Jakub Jelinek  <jakub@redhat.com>
 
 	* manager.c (pthread_start_thread): Call __uselocale even
diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h
index 16aee9989f..91eb6e0e2e 100644
--- a/linuxthreads/sysdeps/i386/useldt.h
+++ b/linuxthreads/sysdeps/i386/useldt.h
@@ -76,7 +76,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
 
 #ifdef __PIC__
 # define USETLS_EBX_ARG "r"
-# define USETLS_LOAD_EBX "xchgl %3, %%ebx\n\t"
+# define USETLS_LOAD_EBX "xchgl %1, %%ebx\n\t"
 #else
 # define USETLS_EBX_ARG "b"
 # define USETLS_LOAD_EBX
@@ -108,7 +108,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
 	     "movl %2, %%eax\n\t"					      \
 	     "int $0x80\n\t"						      \
 	     USETLS_LOAD_EBX						      \
-	     : "&a" (__result)						      \
+	     : "=&a" (__result)						      \
 	     : USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area));      \
       if (__result == 0)						      \
 	asm ("movw %w0, %%gs" :: "q" (__gs));				      \
@@ -126,7 +126,7 @@ extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
 	     "movl %2, %%eax\n\t"					      \
 	     "int $0x80\n\t"						      \
 	     USETLS_LOAD_EBX						      \
-	     : "&a" (__result)						      \
+	     : "=&a" (__result)						      \
 	     : USETLS_EBX_ARG (&ldt_entry), "i" (__NR_set_thread_area));      \
       if (__result == 0)						      \
 	{								      \
diff --git a/manual/examples/dir.c b/manual/examples/dir.c
index 59ec62c84c..8ab77dc34c 100644
--- a/manual/examples/dir.c
+++ b/manual/examples/dir.c
@@ -1,5 +1,4 @@
 /*@group*/
-#include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/manual/examples/select.c b/manual/examples/select.c
index def2cd6f9f..a65ed77503 100644
--- a/manual/examples/select.c
+++ b/manual/examples/select.c
@@ -1,4 +1,5 @@
 /*@group*/
+#include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -6,7 +7,7 @@
 /*@end group*/
 
 /*@group*/
-int 
+int
 input_timeout (int filedes, unsigned int seconds)
 {
   fd_set set;
diff --git a/manual/llio.texi b/manual/llio.texi
index e9bf1d0d60..e9b5573ddd 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -2829,7 +2829,7 @@ int
 set_cloexec_flag (int desc, int value)
 @{
   int oldflags = fcntl (desc, F_GETFD, 0);
-  /* @r{If reading the flags failed, return error indication now.}
+  /* @r{If reading the flags failed, return error indication now.} */
   if (oldflags < 0)
     return oldflags;
   /* @r{Set just the flag we want to set.} */
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
index 99258bd99e..672652ab20 100644
--- a/stdio-common/reg-printf.c
+++ b/stdio-common/reg-printf.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <printf.h>
+#include <stddef.h>
 #include <stdlib.h>
 
 /* Array of functions indexed by format character.  */