diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c88973dd8..0fbd941f36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-13  Mark Kettenis  <kettenis@gnu.org>
+
+	* symtab.c (lookup_symtab_1): Use lbasename (NAME) instead of
+	basename (NAME).  The FreeBSD basename returns a pointer to a
+	static buffer, even if it's simply returning a string identical to
+	its argument.
+	(lookup_partial_symtab): Likewise.
+
 2001-05-14  Michael Snyder  <msnyder@redhat.com>
 
 	* solib.c, solib.h: Add comment for function no_shared_libraries.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 8eab3d227a..108ace764d 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -154,7 +154,7 @@ got_symtab:
 
   /* Now, search for a matching tail (only if name doesn't have any dirs) */
 
-  if (basename (name) == name)
+  if (lbasename (name) == name)
     ALL_SYMTABS (objfile, s)
     {
       if (FILENAME_CMP (basename (s->filename), name) == 0)
@@ -244,7 +244,7 @@ lookup_partial_symtab (char *name)
 
   /* Now, search for a matching tail (only if name doesn't have any dirs) */
 
-  if (basename (name) == name)
+  if (lbasename (name) == name)
     ALL_PSYMTABS (objfile, pst)
     {
       if (FILENAME_CMP (basename (pst->filename), name) == 0)