diff --git a/ChangeLog b/ChangeLog
index bf3d821ca0..b36806227e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-16  Roland McGrath  <roland@frob.com>
 
+	[BZ #1254]
+	* sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN
+	byte limit when setting ADDR->sa_family.
+	Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>.
+
 	[BZ #1253]
 	* sysdeps/mach/hurd/dl-sysdep.h
 	[SHARED] (DL_ARGV_NOT_RELRO): New macro.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7059de65a6..3c8e73a2b9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-10  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile ($(test-modules)): Remove static pattern rule.
+
 2005-10-14  Jakub Jelinek  <jakub@redhat.com>
             Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c
index 2e4f9f6a9d..39071c1da4 100644
--- a/sysdeps/mach/hurd/getpeername.c
+++ b/sysdeps/mach/hurd/getpeername.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1994,1997,1999,2000,2005 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
@@ -47,14 +47,19 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
 
   if (*len > buflen)
     *len = buflen;
-  
+
   if (buf != (char *) addr)
     {
       memcpy (addr, buf, *len);
       __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
     }
 
-  addr->sa_family = type;
+  const sa_family_t family = type;
+  if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
+    memcpy (&addr->sa_family, &family,
+	    *len - offsetof (struct sockaddr, sa_family));
+  else
+    addr->sa_family = family;
 
   return 0;
 }