diff --git a/ChangeLog b/ChangeLog
index 85ddf3b40d..334acfaaac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-10  Andreas Jaeger  <aj@suse.de>
 
+	* sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h (enum): Add
+	REG_OLDMASK and REG_CR2 to synch with kernel header.
+	(NGREG): Increase.
+
 	* nss/getXXent.c (GETFUNC_NAME): Use union type to avoid strict
 	aliasing problem.
 	* nss/getXXbyYY_r.c (INTERNAL): Likewise.
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h b/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
index 826f3b5dea..b59cd292f9 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h
@@ -33,7 +33,7 @@
 typedef long int greg_t;
 
 /* Number of general registers.  */
-#define NGREG	21
+#define NGREG	23
 
 /* Container for all general registers.  */
 typedef greg_t gregset_t[NGREG];
@@ -82,8 +82,12 @@ enum
 # define REG_CSGSFS	REG_CSGSFS
   REG_ERR,
 # define REG_ERR	REG_ERR
-  REG_TRAPNO
+  REG_TRAPNO,
 # define REG_TRAPNO	REG_TRAPNO
+  REG_OLDMASK,
+# define REG_OLDMASK	REG_OLDMASK
+  REG_CR2
+# define REG_CR2	REG_CR2
 };
 #endif