diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d3c833cbe6..4042830eed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* auxv.c (fprint_target_auxv): Handle AT_BASE_PLATFORM and
+	AT_EXECFN.  Re-sort AT_SECURE.
+
 2008-11-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* monitor.c (monitor_insert_breakpoint): Remove unused variable `bp'.
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 121a749731..fd42949f56 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -203,9 +203,11 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 	  TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec);
 	  TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec);
 	  TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec);
+	  TAG (AT_BASE_PLATFORM, _("String identifying base platform"), str);
+	  TAG (AT_EXECFN, _("File name of executable"), str);
+	  TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec);
 	  TAG (AT_SYSINFO, _("Special system info/entry points"), hex);
 	  TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex);
-	  TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec);
 	  TAG (AT_SUN_UID, _("Effective user ID"), dec);
 	  TAG (AT_SUN_RUID, _("Real user ID"), dec);
 	  TAG (AT_SUN_GID, _("Effective group ID"), dec);
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 964f6cfe5c..2699b03d4d 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* common.h (AT_BASE_PLATFORM, AT_EXECFN): Define.
+
 2008-10-10  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* ppc.h: Add Tag_GNU_Power_ABI_Struct_Return.
diff --git a/include/elf/common.h b/include/elf/common.h
index 995edbc581..5a0c322996 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -798,6 +798,9 @@
 #define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
 #define AT_IGNOREPPC	22		/* Entry should be ignored */
 #define	AT_SECURE	23		/* Boolean, was exec setuid-like?  */
+#define AT_BASE_PLATFORM 24		/* String identifying real platform,
+					   may differ from AT_PLATFORM.  */
+#define AT_EXECFN	31		/* Filename of executable.  */
 /* Pointer to the global system page used for system calls and other
    nice things.  */
 #define AT_SYSINFO	32