diff --git a/ChangeLog b/ChangeLog
index 7494f82eba..e64892b0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-10-23  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (O_NOFOLLOW): New
+	macro.
+	* sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h (O_LARGEFILE,
+	O_NOFOLLOW, O_DIRECT): New macros.
+	(O_DIRECTORY): Correct definition according to official 2.1.126.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (O_DIRECTORY,
+	O_NOFOLLOW): New macros.
+
 1998-10-24  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* include/ldsodefs.h: Test HAVE_ELF instead of __ELF__.
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
index e67ad19f65..70ebbeba61 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
@@ -46,6 +46,7 @@
 #ifdef __USE_GNU
 # define O_DIRECT	040000	/* Direct disk access.  */
 # define O_DIRECTORY	0100000	/* Must be a directory.  */
+# define O_NOFOLLOW	0200000	/* Do not follow links.  */
 #endif
 
 /* Not necessary, files are always with 64bit off_t.  */
diff --git a/sysdeps/unix/sysv/linux/bits/fcntl.h b/sysdeps/unix/sysv/linux/bits/fcntl.h
index 35881d8ef3..a2bbf29e03 100644
--- a/sysdeps/unix/sysv/linux/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl.h
@@ -43,6 +43,7 @@
 
 #ifdef __USE_GNU
 # define O_DIRECTORY	040000	/* Must be a directory.  */
+# define O_NOFOLLOW	0100000	/* Do not follow links.  */
 #endif
 
 /* XXX missing */
diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index 0c8afd22fa..d4ef8e1096 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -44,6 +44,7 @@
 #ifdef __USE_GNU
 # define O_DIRECT	 040000	/* Direct disk access.  */
 # define O_DIRECTORY	0200000	/* Must be a directory.  */
+# define O_NOFOLLOW	0400000	/* Do not follow links.  */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index 63e754d5fe..a01dcaec32 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -41,7 +41,10 @@
 #define O_ASYNC		0x1000
 
 #ifdef __USE_GNU
-# define O_DIRECTORY	0x2000	/* Must be a directory.  */
+# define O_LARGEFILE	0x2000	/* Allow large file opens.  */
+# define O_NOFOLLOW	0x4000	/* Do not follow links.  */
+# define O_DIRECT	0x8000	/* Direct disk access hint.  */
+# define O_DIRECTORY	0x10000	/* Must be a directory.  */
 #endif
 
 #define O_NDELAY	O_NONBLOCK