diff --git a/ChangeLog b/ChangeLog
index 007b61cde3..98661dc2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-09  Roland McGrath  <roland@hack.frob.com>
+
+	* elf/elf.h (ELFOSABI_GNU): New macro.
+	(ELFOSABI_LINUX): Define to that.
+
 2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
 
 	* string/strncat.c (strncat): Undef the symbol in case it has been
@@ -7,7 +12,7 @@
 
 	* elf/sotruss.ksh: Clean up, fix, and complete help messages.
 
-	* elf/dl-iteratephdr.c (hidden_proto): Fill in data from the real
+	* elf/dl-iteratephdr.c (__dl_iterate_phdr): Fill in data from the real
 	link map.
 
 2011-08-17  Andreas Jaeger  <aj@suse.de>
diff --git a/elf/elf.h b/elf/elf.h
index 47db25c162..7c64120782 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -142,7 +142,8 @@ typedef struct
 #define ELFOSABI_SYSV		0	/* Alias.  */
 #define ELFOSABI_HPUX		1	/* HP-UX */
 #define ELFOSABI_NETBSD		2	/* NetBSD.  */
-#define ELFOSABI_LINUX		3	/* Linux.  */
+#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
+#define ELFOSABI_LINUX		ELFOSABI_GNU /* Compatibility alias.  */
 #define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
 #define ELFOSABI_AIX		7	/* IBM AIX.  */
 #define ELFOSABI_IRIX		8	/* SGI Irix.  */