diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb9b882c67b..d90f217ff69 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 18 16:53:19 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+	* netbsd.h (ASM_OUTPUT_ALIGN): Redefine.
+
 Wed Mar 18 12:43:20 1998  Jim Wilson  <wilson@cygnus.com>
 
 	* loop.c (struct movable): New field move_insn_first.
diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h
index 1c3353e9045..c7aeddf6605 100644
--- a/gcc/config/i386/netbsd.h
+++ b/gcc/config/i386/netbsd.h
@@ -56,6 +56,13 @@
    we want to retain compatibility with older gcc versions.  */
 #define DEFAULT_PCC_STRUCT_RETURN 0
 
+/* i386 netbsd 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))
+
 /* Profiling routines, partially copied from i386/osfrose.h.  */
 
 /* Redefine this to use %eax instead of %edx.  */