diff --git a/gas/ChangeLog b/gas/ChangeLog
index 022e05819c..5b4052b786 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-16  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (mips_elf_final_processing): Set elf	header flags
+	for n32 ABI if appropriate.
+
 2001-08-16  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* config/tc-mips.c (cons_fix_new_mips): Remove.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index a374e3f190..53e2efc861 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -11556,6 +11556,10 @@ mips_elf_final_processing ()
       else
 	elf_elfheader (stdoutput)->e_flags |= E_MIPS_ABI_EABI32;
     }
+  else if (strcmp (mips_abi_string, "n32") == 0)
+    elf_elfheader (stdoutput)->e_flags |= EF_MIPS_ABI2;
+
+  /* Nothing to do for "64".  */
 
   if (mips_32bitmode)
     elf_elfheader (stdoutput)->e_flags |= EF_MIPS_32BITMODE;