diff --git a/ChangeLog b/ChangeLog
index 4bb681929c..bb1341b80e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Fri Jul  5 12:22:51 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* sysdeps/unix/sysv/linux/sys/user.h: New file.
+	* sysdeps/unix/sysv/linux/Dist: Add it.
+	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add sys/user.h.
+
 	* nss/nss_files/files-parse.c (parse_list): Set EOL from LINE if it
 	points within DATA->linebuffer; otherwise use all of DATA->linebuffer
 	itself, no need to skip past a NUL.
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 9daf03a947..423d002f0b 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -12,4 +12,5 @@ sys/socketcall.h
 sys/sysctl.h
 sys/sysinfo.h
 sys/timex.h
+sys/user.h
 termio.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index db81c2cc8e..6eaf33852f 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -8,7 +8,7 @@ setfsgid setfsuid sysinfo uselib s_reboot
 
 sysdep_headers += sys/mount.h sys/sysinfo.h sys/acct.h sys/sysctl.h \
 		  sys/module.h sys/io.h sys/klog.h sys/kdaemon.h \
-		  syscall-list.h
+		  sys/user.h syscall-list.h
 
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
 $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/syscall.h
diff --git a/sysdeps/unix/sysv/linux/sys/user.h b/sysdeps/unix/sysv/linux/sys/user.h
new file mode 100644
index 0000000000..30e9b57ab7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sys/user.h
@@ -0,0 +1 @@
+#include <linux/user.h>