diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7e81552e19..ba106c53d7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-26  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/13049
+	* elf64-ppc.c (STUB_SUFFIX): Revert previous delta.
+	* elf32-hppa.c (STUB_SUFFIX): Likewise.
+
 2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
 
 	* Makefile.am (ALL_MACHINES): Add cpu-epiphany.lo.
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index b7d951b3c5..7f0f2cb10e 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -155,8 +155,8 @@ static const bfd_byte plt_stub[] =
 };
 
 /* Section name for stubs is the associated section name plus this
-   string.  PR 13049: Use a name that is not a valid C identifier.  */
-#define STUB_SUFFIX ".__stub"
+   string.  */
+#define STUB_SUFFIX ".stub"
 
 /* We don't need to copy certain PC- or GP-relative dynamic relocs
    into a shared object's dynamic section.  All the relocs of the
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 674bff4d18..dfe10fa28c 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -3527,8 +3527,8 @@ must_be_dyn_reloc (struct bfd_link_info *info,
 #define ELIMINATE_COPY_RELOCS 1
 
 /* Section name for stubs is the associated section name plus this
-   string.  PR 13049: Use a name that is not a valid C identifier.  */
-#define STUB_SUFFIX ".__stub"
+   string.  */
+#define STUB_SUFFIX ".stub"
 
 /* Linker stubs.
    ppc_stub_long_branch: