diff --git a/ChangeLog b/ChangeLog
index 62ae972d44..678bc1ef37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Tue Jun  4 02:25:44 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* sysdeps/unix/sysv/linux/gnu/types.h (__KERNEL_STRICT_NAMES): Define
+	this macro too; current Linux kernels test that instead of
+	_LINUX_TYPES_DONT_EXPORT.
+
 	* elf/linux-compat.c (_init): Pass reloc_addr arg to _dl_lookup_symbol.
 
 	* elf/dl-lookup.c (_dl_lookup_symbol): Use l_searchlist.
diff --git a/sysdeps/unix/sysv/linux/gnu/types.h b/sysdeps/unix/sysv/linux/gnu/types.h
index 939d205bda..719d136e16 100644
--- a/sysdeps/unix/sysv/linux/gnu/types.h
+++ b/sysdeps/unix/sysv/linux/gnu/types.h
@@ -21,6 +21,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Get actual type definitions for architecture from kernel headers.
    This #define tells <linux/types.h> not to define `dev_t' et al itself.  */
+#define __KERNEL_STRICT_NAMES
 #define _LINUX_TYPES_DONT_EXPORT
 #include <linux/types.h>
 
@@ -53,6 +54,7 @@ typedef __kernel_nlink_t __nlink_t; 	/* Type of file link counts.  */
 typedef __kernel_off_t __off_t;		/* Type of file sizes and offsets.  */
 typedef __kernel_pid_t __pid_t;		/* Type of process identifications.  */
 typedef __kernel_ssize_t __ssize_t;	/* Type of a byte count, or error.  */
+#define __kernel_fsid_t long long /* XXX */
 typedef __kernel_fsid_t __fsid_t;	/* Type of file system IDs.  */
 
 /* Everythin' else.  */