diff --git a/gas/ChangeLog b/gas/ChangeLog
index b73a2eafd9..d891d3013a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (mips_target_format): Fix formatting.
+	Add recognition of n32 ABI formats.
+
 2002-07-30  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
 	* tc-mips.c (load_address): Don't clobber $at when loading a
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 778eec174a..0c7286a80e 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -989,17 +989,26 @@ mips_target_format ()
       return "pe-mips";
     case bfd_target_elf_flavour:
 #ifdef TE_TMIPS
-      /* This is traditional mips */
+      /* This is traditional mips.  */
       return (target_big_endian
-	      ? (HAVE_64BIT_OBJECTS ? "elf64-tradbigmips"
-		 : "elf32-tradbigmips")
-	      : (HAVE_64BIT_OBJECTS ? "elf64-tradlittlemips"
-		 : "elf32-tradlittlemips"));
+	      ? (HAVE_64BIT_OBJECTS
+		 ? "elf64-tradbigmips"
+		 : (HAVE_NEWABI
+		    ? "elf32-ntradbigmips" : "elf32-tradbigmips"))
+	      : (HAVE_64BIT_OBJECTS
+		 ? "elf64-tradlittlemips"
+		 : (HAVE_NEWABI
+		    ? "elf32-ntradlittlemips" : "elf32-tradlittlemips")));
 #else
       return (target_big_endian
-	      ? (HAVE_64BIT_OBJECTS ? "elf64-bigmips" : "elf32-bigmips")
-	      : (HAVE_64BIT_OBJECTS ? "elf64-littlemips"
-		 : "elf32-littlemips"));
+	      ? (HAVE_64BIT_OBJECTS
+		 ? "elf64-bigmips"
+		 : (HAVE_NEWABI
+		    ? "elf32-nbigmips" : "elf32-bigmips"))
+	      : (HAVE_64BIT_OBJECTS
+		 ? "elf64-littlemips"
+		 : (HAVE_NEWABI
+		    ? "elf32-nlittlemips" : "elf32-littlemips")));
 #endif
     default:
       abort ();