diff --git a/ChangeLog b/ChangeLog
index 1ed40ce12d..ad78f40adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 
 	* version.h (VERSION): Bump to 2.2.94.
 
+	* sysdeps/powerpc/fpu/Dist: Move fprrest.S and fprsave.S to...
+	* sysdeps/powerpc/powerpc32/fpu/Dist: ...here.  New file.
+	* sysdeps/unix/sysv/linux/powerpc/Dist: Move kernel_stat.h to...
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist: ...here.
+
+	* sysdeps/i386/Makefile: Remove obsolete db2 rules.
+
+	* sysdeps/unix/sysv/linux/Makefile: Add exit-thread.S.
+
+	* sysdeps/unix/sysv/linux/powerpc/Dist: Add ldd-rewrite.sh.
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist: New file.
+
 2002-09-18  Roland McGrath  <roland@redhat.com>
 
 	* locale/lc-ctype.c (_nl_postload_ctype): Add compat_symbol decls for
diff --git a/FAQ b/FAQ
index a993ae56cf..2342b0409f 100644
--- a/FAQ
+++ b/FAQ
@@ -47,6 +47,7 @@ please let me know.
 1.19.	`make' complains about a missing dlfcn/libdl.so when building
 	malloc/libmemprof.so.  How can I fix this?
 1.20.	Which tools should I use for MIPS?
+1.21.	Which compiler should I use for powerpc64?
 
 2. Installation and configuration issues
 
@@ -208,6 +209,7 @@ in the future, are:
 	m68k-*-linux-gnu	Linux-2.x on Motorola 680x0
 	alpha*-*-linux-gnu	Linux-2.x on DEC Alpha
 	powerpc-*-linux-gnu     Linux and MkLinux on PowerPC systems
+	powerpc64-*-linux-gnu	Linux-2.4+ on 64-bit PowerPC systems
 	sparc-*-linux-gnu	Linux-2.x on SPARC
 	sparc64-*-linux-gnu	Linux-2.x on UltraSPARC
 	arm-*-none		ARM standalone systems
@@ -575,6 +577,12 @@ doesn't handle all cases and needs help from the kernel).
 
 For details check also my page <http://www.suse.de/~aj/glibc-mips.html>.
 
+
+1.21.	Which compiler should I use for powerpc64?
+
+{SM} You want to use at least gcc 3.2 (together with the right versions
+of all the other tools, of course).
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 
@@ -1932,6 +1940,7 @@ Answers were given by:
 {CG} Cristian Gafton, <gafton@redhat.com>
 {AO} Alexandre Oliva, <aoliva@redhat.com>
 {BH} Bruno Haible, <haible@clisp.cons.org>
+{SM} Steven Munroe, <sjmunroe@us.ibm.com>
 
 Local Variables:
  mode:outline
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index e71b27c243..dff1b769d7 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -17,10 +17,6 @@ shared-only-routines += divdi3
 endif
 endif
 
-ifeq ($(subdir),db2)
-CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_X86_GCC=1
-endif
-
 ifeq ($(subdir),gmon)
 sysdep_routines += i386-mcount
 endif
diff --git a/sysdeps/powerpc/fpu/Dist b/sysdeps/powerpc/fpu/Dist
index da110950ed..948b04a2b3 100644
--- a/sysdeps/powerpc/fpu/Dist
+++ b/sysdeps/powerpc/fpu/Dist
@@ -1,6 +1,4 @@
 fe_nomask.c
-fprrest.S
-fprsave.S
 fenv_const.c
 fenv_libc.h
 t_sqrt.c
diff --git a/sysdeps/powerpc/powerpc32/fpu/Dist b/sysdeps/powerpc/powerpc32/fpu/Dist
new file mode 100644
index 0000000000..375e57172e
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/fpu/Dist
@@ -0,0 +1,2 @@
+fprrest.S
+fprsave.S
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 71a12c1bae..881f11bd69 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -3,6 +3,7 @@ bits/pthreadtypes.h
 cmsg_nxthdr.c
 dl-brk.c
 dl-sbrk.c
+exit-thread.S
 getdirentries.c
 getdirentries64.c
 ipc_priv.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/Dist b/sysdeps/unix/sysv/linux/powerpc/Dist
index 4f09f64323..c4a919c91e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Dist
+++ b/sysdeps/unix/sysv/linux/powerpc/Dist
@@ -1,8 +1,8 @@
 dl-brk.S
 fe_nomask.c
 ipc_priv.h
-kernel_stat.h
 kernel_termios.h
+ldd-rewrite.sed
 oldgetrlimit64.c
 sys/procfs.h
 sys/ptrace.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist
index 738b9cc542..381f878080 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Dist
@@ -1 +1,2 @@
 clone.S
+kernel_stat.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist
new file mode 100644
index 0000000000..738b9cc542
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Dist
@@ -0,0 +1 @@
+clone.S