diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8fdda3770a..c7f72b9f0f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-25  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* elf32-mips.c (elf_mips_abi_name): Return the right ABI string for
+	E_MIPS_ABI_O64 and E_MIPS_ABI_EABI64
+
 2001-08-24  H.J. Lu  <hjl@gnu.org>
 
 	* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index baeb01fc12..fcf4cc7dd2 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -1928,16 +1928,16 @@ elf_mips_abi_name (abfd)
 {
   flagword flags;
 
-  if (ABI_N32_P (abfd))
-    return "N32";
-  else if (ABI_64_P (abfd))
-    return "64";
-
   flags = elf_elfheader (abfd)->e_flags;
   switch (flags & EF_MIPS_ABI)
     {
     case 0:
-      return "none";
+      if (ABI_N32_P (abfd))
+	return "N32";
+      else if (ABI_64_P (abfd))
+	return "64";
+      else
+	return "none";
     case E_MIPS_ABI_O32:
       return "O32";
     case E_MIPS_ABI_O64: