diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 80dd58e4af..fc78333e15 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* readelf.c (process_program_headers): Match PT_TLS segment
+	only with SHT_TLS sections.
+
 2006-02-07  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* readelf.c (get_machine_flags): Add logic for EF_M68K flags.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 0bb2fdb2c5..a10dc41a88 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -3448,6 +3448,9 @@ process_program_headers (FILE *file)
 	  for (j = 1; j < elf_header.e_shnum; j++, section++)
 	    {
 	      if (section->sh_size > 0
+		  /* PT_TLS segment contains only SHF_TLS sections.  */
+		  && (segment->p_type != PT_TLS
+		      || (section->sh_flags & SHF_TLS) != 0)
 		  /* Compare allocated sections by VMA, unallocated
 		     sections by file offset.  */
 		  && (section->sh_flags & SHF_ALLOC