diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b0e12f6249f..230ba3e8854 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 Sat Dec 12 23:39:10 1998  Jeffrey A Law  (law@cygnus.com)
 
+	* i386/next.h (ASM_OUTPUT_ALIGN): Use 0x90 for fill character.
+
 	* rtlanal.c (multiple_sets): New function.
 	* rtl.h (multiple_sets): Declare it.
 	* local-alloc.c (wipe_dead_reg): Use it.
diff --git a/gcc/config/i386/next.h b/gcc/config/i386/next.h
index 8dd46f5cd41..65f74023999 100644
--- a/gcc/config/i386/next.h
+++ b/gcc/config/i386/next.h
@@ -224,3 +224,10 @@ Boston, MA 02111-1307, USA.  */
               == void_type_node))) ? (SIZE) : 0)
 
 /* END Calling Convention CHANGES */
+
+/* NeXT still uses old binutils that don't insert nops by default
+   when the .align directive demands to insert extra space in the text
+   segment.  */
+#undef ASM_OUTPUT_ALIGN
+#define ASM_OUTPUT_ALIGN(FILE,LOG) \
+  if ((LOG)!=0) fprintf ((FILE), "\t.align %d,0x90\n", (LOG))