diff --git a/ChangeLog b/ChangeLog
index 42bf1914c6..35a35d2c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-02-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdlib/test-a64l.c (tests): Add more test cases.
+
+	* sunrpc/rtime.c (rtime): Change type of thetime to uint32_t.
+	Reported by Walter Harms <WHarms@bfs.de>.
+
+2002-02-11  Jes Sorensen  <jes@trained-monkey.org>
+
+	* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h: Add sc_flag bit
+	definitions for struct sigcontext.
+	Suggested by David Mosberger-Tang.
+
 2002-02-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/dl-close.c (remove_slotinfo): New function.  Handles everything
diff --git a/stdlib/test-a64l.c b/stdlib/test-a64l.c
index 31ef5ea2c7..2fc10d65e5 100644
--- a/stdlib/test-a64l.c
+++ b/stdlib/test-a64l.c
@@ -1,5 +1,5 @@
 /* Test program for the l64a and a64l functions.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@suse.de>.
 
@@ -38,6 +38,12 @@ static const struct a64l_test tests[] =
     { "", 0 },
     { "/", 1 },
     { "FT", 2001 },
+    { "zzzzz1", 0xffffffff },
+    { "zzzz1", 0x3ffffff },
+    { "zzz1", 0xfffff },
+    { "zz1", 0x3fff },
+    { "z1", 0xff },
+    { "1", 0x3 },
     { NULL, 0 }
   };
 
diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
index ba3e768b08..536d018c90 100644
--- a/sunrpc/rtime.c
+++ b/sunrpc/rtime.c
@@ -77,7 +77,8 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
   struct pollfd fd;
   int milliseconds;
   int res;
-  unsigned long thetime;
+  /* RFC 868 says the time is transmitted as a 32-bit value.  */
+  uint32_t thetime;
   struct sockaddr_in from;
   int fromlen;
   int type;
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
index 8a87375e77..d67576f242 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
@@ -57,4 +57,13 @@ struct sigcontext
   unsigned long int sc_mask;	/* signal mask to restore after handler returns */
 };
 
+/* sc_flag bit definitions. */
+#define IA64_SC_FLAG_ONSTACK_BIT	0	/* is handler running on signal stack? */
+#define IA64_SC_FLAG_IN_SYSCALL_BIT	1	/* did signal interrupt a syscall? */
+#define IA64_SC_FLAG_FPH_VALID_BIT	2	/* is state in f[32]-f[127] valid? */
+
+#define IA64_SC_FLAG_ONSTACK		(1 << IA64_SC_FLAG_ONSTACK_BIT)
+#define IA64_SC_FLAG_IN_SYSCALL		(1 << IA64_SC_FLAG_IN_SYSCALL_BIT)
+#define IA64_SC_FLAG_FPH_VALID		(1 << IA64_SC_FLAG_FPH_VALID_BIT)
+
 #endif /* _BITS_SIGCONTEXT_H */