diff --git a/ChangeLog b/ChangeLog
index 2a5b552858..4406b15ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-04-24  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/generic/send.c (__send): Return ssize_t.
+	* sysdeps/mach/hurd/send.c (__send): Likewise.
+	* sysdeps/mach/hurd/recv.c (recv): Likewise.
+	* sysdeps/mach/hurd/sendto.c (sendto): Likewise.
+	* sysdeps/generic/sendto.c (sendto): Likewise.
+	* sysdeps/generic/recvmsg.c (recvmsg): Likewise.
+	* sysdeps/mach/hurd/recvfrom.c (recvfrom): Likewise.
+	* sysdeps/generic/recvfrom.c (recvfrom): Likewise.
+	* sysdeps/generic/sendmsg.c (sendmsg): Likewise.
+
+	* socket/sys/socket.h: send* and recv* return ssize_t.
+
+	* include/sys/socket.h: send returns ssize_t.
+
+	* sysdeps/i386/fpu_control.h: Fix comments.
+
 2001-04-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/ia64/Dist: Add hp-timing.c.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 8a18147927..371bd4b8f5 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-24  Andreas Jaeger  <aj@suse.de>
+
+	* wrapsyscall.c: send* and recv* return ssize_t.
+
+	* sysdeps/pthread/timer_getoverr.c (timer_getoverrun): Unlock the
+	mutex instead of double locking it.
+	Reported by Pierre Artaud <partaud@sodatec.com>.
+
 2001-04-23  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/getcpuclockid.c: Make function generic, test
diff --git a/linuxthreads/sysdeps/pthread/timer_getoverr.c b/linuxthreads/sysdeps/pthread/timer_getoverr.c
index 520458c712..204addc85a 100644
--- a/linuxthreads/sysdeps/pthread/timer_getoverr.c
+++ b/linuxthreads/sysdeps/pthread/timer_getoverr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
 
@@ -39,7 +39,7 @@ timer_getoverrun (timerid)
   else
     retval = 0; /* TODO: overrun counting not supported */
 
-  pthread_mutex_lock (&__timer_mutex);
+  pthread_mutex_unlock (&__timer_mutex);
 
   return retval;
 }