diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a9ffccf549f..086b4b1096f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* elf.c (assign_file_positions_for_load_sections): Set the type of
+	PT_NOTE sections to SHT_NOTE.
+
 2008-02-17  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* simple.c (bfd_simple_get_relocated_section_contents): Set
diff --git a/bfd/elf.c b/bfd/elf.c
index 192e0cc92e0..cce71636056 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4284,6 +4284,10 @@ assign_file_positions_for_load_sections (bfd *abfd,
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
+      /* Set the note section type to SHT_NOTE.  */
+      else if (p->p_type == PT_NOTE)
+	for (i = 0; i < m->count; i++)
+	  elf_section_type (m->sections[i]) = SHT_NOTE;
 
       p->p_offset = 0;
       p->p_filesz = 0;