diff --git a/include/ChangeLog b/include/ChangeLog
index 96f177772..18d0b3509 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* bfdlink.h (struct bfd_link_info): Add execstack and noexecstack.
+	* elf/common.h (PT_GNU_STACK): Define.
+
 2003-06-03  H.J. Lu <hongjiu.lu@intel.com>
 
 	* bfdlink.h (LD_DEFINITION_IN_DISCARDED_SECTION): New.
diff --git a/include/bfdlink.h b/include/bfdlink.h
index d68fe113f..4636025b8 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -297,6 +297,14 @@ struct bfd_link_info
   /* TRUE if generating an executable, position independent or not.  */
   unsigned int executable : 1;
 
+  /* TRUE if PT_GNU_STACK segment should be created with PF_R|PF_W|PF_X
+     flags.  */
+  unsigned int execstack: 1;
+
+  /* TRUE if PT_GNU_STACK segment should be created with PF_R|PF_W
+     flags.  */
+  unsigned int noexecstack: 1;
+
   /* Which symbols to strip.  */
   enum bfd_link_strip strip;
 
diff --git a/include/elf/common.h b/include/elf/common.h
index f342d5737..3635bbb64 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -288,6 +288,7 @@
 #define PT_HIPROC	0x7FFFFFFF	/* Processor-specific */
 
 #define PT_GNU_EH_FRAME	(PT_LOOS + 0x474e550)
+#define PT_GNU_STACK	(PT_LOOS + 0x474e551)
 
 /* Program segment permissions, in program header p_flags field.  */