diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82f64f7d53..4af7a46f17 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-19  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	From Peter Schauer <Peter.Schauer@regent.e-technik.tu-muenchen.de>
+ 	* symtab.c (lookup_symbol_aux): Call lookup_symbol_aux, not
+ 	lookup_symbol, when trying to find a symbol with a mangled name,
+ 	to avoid infinite recursion.
+
 2001-02-18  Andrew Cagney  <ac131313@redhat.com>
 
 	* TODO (5.2): Mention G++ 3.0 ABI.  General cleanups.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 6b35d57423..76c2a94e8d 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -949,8 +949,8 @@ lookup_symbol_aux (const char *name, const struct block *block,
 		   && MSYMBOL_TYPE (msymbol) != mst_file_text
 		   && !STREQ (name, SYMBOL_NAME (msymbol)))
 	    {
-	      return lookup_symbol (SYMBOL_NAME (msymbol), block,
-				    namespace, is_a_field_of_this, symtab);
+	      return lookup_symbol_aux (SYMBOL_NAME (msymbol), block,
+					namespace, is_a_field_of_this, symtab);
 	    }
 	}
     }