diff --git a/gold/ChangeLog b/gold/ChangeLog
index a0a461f484..9e28c6273d 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-08  Cary Coutant  <ccoutant@google.com>
+
+	* layout.cc (gdb_sections): Update GDB version, add .debug_addr.
+	(lines_only_debug_sections): Likewise.
+
 2012-05-02  Roland McGrath  <mcgrathr@google.com>
 
 	* nacl.cc: New file.
diff --git a/gold/layout.cc b/gold/layout.cc
index 7155f22e7f..b58f9d2e40 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -455,32 +455,36 @@ Layout::Hash_key::operator()(const Layout::Key& k) const
 
 // Returns whether the given section is in the list of
 // debug-sections-used-by-some-version-of-gdb.  Currently,
-// we've checked versions of gdb up to and including 6.7.1.
+// we've checked versions of gdb up to and including 7.4.
 
 static const char* gdb_sections[] =
 { ".debug_abbrev",
-  // ".debug_aranges",   // not used by gdb as of 6.7.1
+  ".debug_addr",         // Fission extension
+  // ".debug_aranges",   // not used by gdb as of 7.4
   ".debug_frame",
   ".debug_info",
   ".debug_types",
   ".debug_line",
   ".debug_loc",
   ".debug_macinfo",
-  // ".debug_pubnames",  // not used by gdb as of 6.7.1
+  // ".debug_pubnames",  // not used by gdb as of 7.4
+  // ".debug_pubtypes",  // not used by gdb as of 7.4
   ".debug_ranges",
   ".debug_str",
 };
 
 static const char* lines_only_debug_sections[] =
 { ".debug_abbrev",
-  // ".debug_aranges",   // not used by gdb as of 6.7.1
+  // ".debug_addr",      // Fission extension
+  // ".debug_aranges",   // not used by gdb as of 7.4
   // ".debug_frame",
   ".debug_info",
   // ".debug_types",
   ".debug_line",
   // ".debug_loc",
   // ".debug_macinfo",
-  // ".debug_pubnames",  // not used by gdb as of 6.7.1
+  // ".debug_pubnames",  // not used by gdb as of 7.4
+  // ".debug_pubtypes",  // not used by gdb as of 7.4
   // ".debug_ranges",
   ".debug_str",
 };