diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 60cb74f7ec..3677b5f899 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Andrew Cagney  <cagney@gnu.org>
+
+	* gdb.texinfo (Contributors): Note the original multi-arch
+	contributors.
+
 2005-06-03  Eli Zaretskii  <eliz@gnu.org>
 
 	* gdb.texinfo (Registers): Add index entries for the standard
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 4b5ecc6ee7..f8cc5189b6 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -477,6 +477,13 @@ Cygnus Solutions, implemented the original @sc{gdb/mi} interface.
 Jim Blandy added support for preprocessor macros, while working for Red
 Hat.
 
+Andrew Cagney designed @value{GDBN}'s architecture vector.  Many
+people including Andrew Cagney, Stephane Carrez, Randolph Chung, Nick
+Duffek, Richard Henderson, Mark Kettenis, Grace Sainsbury, Kei
+Sakamoto, Yoshinori Sato, Michael Snyder, Andreas Schwab, Jason
+Thorpe, Corinna Vinschen, Ulrich Weigand, and Elena Zannoni, helped
+with the migration of old architectures to this new framework.
+
 @node Sample Session
 @chapter A Sample @value{GDBN} Session