diff --git a/ld/ChangeLog b/ld/ChangeLog
index c669d31f53..5741a841b4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* scripttempl/elf.sc: Add .note.gnu.build-id.
+
 2007-07-25  Nick Clifton  <nickc@redhat.com>
 
 	PR 4824
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 3a2772da18..a59a884119 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -267,6 +267,7 @@ SECTIONS
   ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
   ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
   ${INITIAL_READONLY_SECTIONS}
+  .note.gnu.build-id : { *(.note.gnu.build-id) }
   ${TEXT_DYNAMIC+${DYNAMIC}}
   .hash         ${RELOCATING-0} : { *(.hash) }
   .gnu.hash     ${RELOCATING-0} : { *(.gnu.hash) }