diff --git a/ld/ChangeLog b/ld/ChangeLog
index 067f6608d0..582ab6f78a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* ld.texinfo: Document -z {no,}execstack, -z {no,}relro
+	and --eh-frame-hdr options.
+
 2005-09-07  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldexp.c (fold_name <SIZEOF>): Return 0 for non-existent section.
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index ccb4b57543..2099971eb0 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -929,6 +929,9 @@ lookup caching possible.
 Disallows undefined symbols in object files.  Undefined symbols in
 shared libraries are still allowed.
 
+@item execstack
+Marks the object as requiring executable stack.
+
 @item initfirst
 This option is only meaningful when building a shared object.
 It marks the object so that its runtime initialization will occur
@@ -967,6 +970,12 @@ Marks the object not available to @code{dlopen}.
 @item nodump
 Marks the object can not be dumped by @code{dldump}.
 
+@item noexecstack
+Marks the object as not requiring executable stack.
+
+@item norelro
+Don't create an ELF @code{PT_GNU_RELRO} segment header in the object.
+
 @item now
 When generating an executable or shared library, mark it to tell the
 dynamic linker to resolve all symbols when the program is started, or
@@ -977,6 +986,9 @@ first called.
 @item origin
 Marks the object may contain $ORIGIN.
 
+@item relro
+Create an ELF @code{PT_GNU_RELRO} segment header in the object.
+
 @end table
 
 Other keywords are ignored for Solaris compatibility.  
@@ -1814,6 +1826,11 @@ you should not put the definition of @code{__real_malloc} in the same
 file as @code{__wrap_malloc}; if you do, the assembler may resolve the
 call before the linker has a chance to wrap it to @code{malloc}.
 
+@kindex --eh-frame-hdr
+@item --eh-frame-hdr
+Request creation of @code{.eh_frame_hdr} section and ELF
+@code{PT_GNU_EH_FRAME} segment header.
+
 @kindex --enable-new-dtags
 @kindex --disable-new-dtags
 @item --enable-new-dtags