diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 592344286..43bbbc1ae 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-27  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/asm/types.h: Add __s64 and __u64 types.
+
 2015-04-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (path_conv::set_nt_native_path): New function.
diff --git a/winsup/cygwin/include/asm/types.h b/winsup/cygwin/include/asm/types.h
index 19cc2ca60..dc51af63a 100644
--- a/winsup/cygwin/include/asm/types.h
+++ b/winsup/cygwin/include/asm/types.h
@@ -1,6 +1,6 @@
 /* asm/types.h
 
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
+   Copyright 1998, 2000, 2001, 2015 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -20,4 +20,8 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
+/* As on Linux.  Works for both platforms, i686 and x86_64. */
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
+
 #endif /* _ASM_TYPES_H */