diff --git a/gold/ChangeLog b/gold/ChangeLog
index d9903ab987..9ea9070c91 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-23  Cary Coutant  <ccoutant@google.com>
+
+	* layout.cc (Layout::section_name_mapping): Match .data.rel.ro.*
+	more carefully.
+
 2012-05-22  Cary Coutant  <ccoutant@google.com>
 
 	* symtab.cc (Symbol::should_add_dynsym_entry): Check for relocatable
diff --git a/gold/layout.cc b/gold/layout.cc
index 0ac0fbf917..e9aeef5cc5 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -4573,8 +4573,8 @@ const Layout::Section_name_mapping Layout::section_name_mapping[] =
 {
   MAPPING_INIT(".text.", ".text"),
   MAPPING_INIT(".rodata.", ".rodata"),
-  MAPPING_INIT(".data.rel.ro.local", ".data.rel.ro.local"),
-  MAPPING_INIT(".data.rel.ro", ".data.rel.ro"),
+  MAPPING_INIT(".data.rel.ro.local.", ".data.rel.ro.local"),
+  MAPPING_INIT(".data.rel.ro.", ".data.rel.ro"),
   MAPPING_INIT(".data.", ".data"),
   MAPPING_INIT(".bss.", ".bss"),
   MAPPING_INIT(".tdata.", ".tdata"),