diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12de4c891d..87c7d96d24 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-15  Joel Brobecker  <brobecker@gnat.com>
+
+	From Paul Hilfinger <hilfinger@gnat.com>
+	* dwarf2read.c (new_symbol): Use SYMBOL_SEARCH_NAME rather than
+	SYMBOL_NATURAL_NAME to set type names.
+
 2005-02-15  Andrew Cagney  <cagney@gnu.org>
 
 	Mark up add_com, add_info and add_prefix_cmd.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ecef2b88ff..bc43046856 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6924,7 +6924,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
 		   this objfile, so we don't need to duplicate it for
 		   the type.  */
 		if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
-		  TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_NATURAL_NAME (sym);
+		  TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_SEARCH_NAME (sym);
 		add_symbol_to_list (typedef_sym, list_to_add);
 	      }
 	  }