diff --git a/ChangeLog b/ChangeLog
index f2c420423d..56c80c6194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-25  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* sysdeps/unix/sysv/linux/aarch64/sys/procfs.h (elf_greg_t):
+	Use uint64_t instead of unsigned long.
+
 2017-08-25  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/tgmath.h [__HAVE_FLOAT128]: Change conditional to
diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
index 7a7b1d0742..5c96bc5f17 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
@@ -32,11 +32,12 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/user.h>
+#include <stdint.h>
 
 __BEGIN_DECLS
 
 /* Type for a general-purpose register.  */
-typedef unsigned long elf_greg_t;
+typedef uint64_t elf_greg_t;
 
 /* And the whole bunch of them.  We could have used `struct
    pt_regs' directly in the typedef, but tradition says that