diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4291fc7da24..84fbc0b7e4f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-07  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (_bfd_elf_is_local_label_name): Treat assembler generated
+	local labels as local.
+
 2015-04-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* compress.c (get_uncompressed_size): Removed.
diff --git a/bfd/elf.c b/bfd/elf.c
index cbc0c918f88..bb5f1c6852d 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -7743,6 +7743,10 @@ _bfd_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
   if (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')
     return TRUE;
 
+  /* Treat assembler generated local labels as local.  */
+  if (name[0] == 'L' && name[strlen (name) - 1] < 32)
+    return TRUE;
+
   return FALSE;
 }