diff --git a/ChangeLog b/ChangeLog
index 95d3a9e799..445b3ade0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of
+	$(inst_slibdir) in AS_NEEDED directive.
+
 2005-03-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* posix/bits/unistd.h (pread, pread64): Don't swap function arguments.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 3da325f723..90ccb1b304 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,10 +1,16 @@
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4.
+
 2005-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
+	[BZ #740]
 	* descr.h (__pthread_find_self, thread_self): Mark as pure
 	instead of const.
 
 2005-02-07  Jakub Jelinek  <jakub@redhat.com>
 
+	[BZ #739]
 	* specific.c (pthread_key_delete): If pthread_create has not been
 	called yet, clear p_specific for the current thread.
 	* Makefile (tests): Add tst-tsd1.
diff --git a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
index b526b62336..7c5cca01ea 100644
--- a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
+++ b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
@@ -8,7 +8,7 @@
 -- Abuse tls.h macros to derive offsets relative to the thread register.
 #  undef __thread_register
 #  define __thread_register	((void *) 0)
-#  define thread_offsetof(mem)	((void *) &THREAD_SELF->p_##mem - (void *) 0)
+#  define thread_offsetof(mem)	((ptrdiff_t) THREAD_SELF + offsetof (struct _pthread_descr_struct, p_##mem))
 
 # else