diff --git a/ChangeLog b/ChangeLog
index 237b759628..756bb152fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-27  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/sysdep.h
+	(__NR_pread, __NR_pwrite): Define these to __NR_pread64, __NR_pwrite64
+	if not defined.
+
+	* sysdeps/unix/sysv/linux/powerpc/lchown.S
+	[SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)]: Use this condition
+	on chown compatibility symbol; use compat_symbol, not symbol_version.
+
 2002-09-27  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/Makefile: Fix typo in comment.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 58c9ef337d..d9a653bc87 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-27  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/x86_64/tls.h [__ASSEMBLER__]: Don't include <pt-machine.h>.
+
 2002-09-24  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/x86_64/tls.h: New file.
diff --git a/sysdeps/unix/sysv/linux/powerpc/lchown.S b/sysdeps/unix/sysv/linux/powerpc/lchown.S
index 804f6177ea..78f892ee39 100644
--- a/sysdeps/unix/sysv/linux/powerpc/lchown.S
+++ b/sysdeps/unix/sysv/linux/powerpc/lchown.S
@@ -1,5 +1,5 @@
 /* lchown system call.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 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
@@ -19,7 +19,7 @@
 
 /* Some old kernel headers call lchown() 'chown'.  The number is
    the same.  */
-	
+
 #include <sysdep.h>
 
 #ifdef __NR_lchown
@@ -30,6 +30,10 @@
 	ret
 	PSEUDO_END(__lchown)
 	weak_alias (__lchown, lchown)
-#if defined PIC && defined DO_VERSIONING
-	symbol_version (__lchown, chown, GLIBC_2.0);
+
+#ifdef SHARED
+#include <shlib-compat.h>
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+compat_symbol (libc, __lchown, chown, GLIBC_2_0)
+# endif
 #endif