diff --git a/ChangeLog b/ChangeLog
index e4d2743d61..105b94aac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-28  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/alpha/setfpucw.c: New file.
+
+2002-05-26  Roland McGrath  <roland@frob.com>
+
+	* sysdeps/mach/hurd/ioctl.c (__ioctl): Don't use sizeof in _IOTS.
+	Use integer_t instead of int for IOC_VOID case.
+
 2002-05-27  Alexandre Oliva  <aoliva@redhat.com>
 
 	* configure.in (DO_STATIC_NSS): Define if --disable-shared.
diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index 08389968df..3d590d5845 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -135,10 +135,10 @@ __ioctl (int fd, unsigned long int request, ...)
 	  /* The RPC takes a single integer_t argument.
 	     Rather than pointing to the value, ARG is the value itself.  */
 #ifdef MACH_MSG_TYPE_BIT
-	  *t++ = io2mach_type (1, _IOTS (int));
-	  *((int *) t)++ = (int) arg;
+	  *t++ = io2mach_type (1, _IOTS (integer_t));
+	  *((integer_t *) t)++ = (integer_t) arg;
 #else
-	  *((int *) p)++ = (int) arg;
+	  *((integer_t *) p)++ = (integer_t) arg;
 #endif
 	}
 
@@ -191,7 +191,7 @@ __ioctl (int fd, unsigned long int request, ...)
 #ifdef MACH_MSG_TYPE_BIT
       if (*(int *) &msg.header.RetCodeType !=
 	  ((union { mach_msg_type_t t; int i; })
-	   { t: io2mach_type (1, _IOTS (sizeof msg.header.RetCode)) }).i)
+	   { t: io2mach_type (1, _IOTS (msg.header.RetCode)) }).i)
 	return MIG_TYPE_ERROR;
 #endif
       return msg.header.RetCode;