diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d21c299fac..5018e43dd5 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-12  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (process_symbol_table): Generate a warning if a local
+	symbol is found at and offste greater than or equal to the sh_info
+	field of it's section header.
+
 2016-08-08  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/20440
diff --git a/binutils/readelf.c b/binutils/readelf.c
index e6674c2f5f..586d13c7de 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -11114,6 +11114,11 @@ process_symbol_table (FILE * file)
 		}
 
 	      putchar ('\n');
+
+	      if (ELF_ST_BIND (psym->st_info) == STB_LOCAL
+		  && si >= section->sh_info)
+		warn (_("local symbol %u found at index >= %s's sh_info value of %u\n"),
+		      si, printable_section_name (section), section->sh_info);
 	    }
 
 	  free (symtab);