diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4143392a1b9..1c650545ec0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 14 11:31:28 1998  Krister Walfridsson <cato@df.lth.se>
+
+	* i386/bsd386.h (ASM_OUTPUT_ALIGN): Redefine.
+
 Tue Apr 14 09:02:32 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* svr4.h (ASM_DECLARE_OBJECT_NAME): Use HOST_WIDE_INT_PRINT_DEC.
diff --git a/gcc/config/i386/bsd386.h b/gcc/config/i386/bsd386.h
index 52e135f35b2..c0dcf87cbdd 100644
--- a/gcc/config/i386/bsd386.h
+++ b/gcc/config/i386/bsd386.h
@@ -24,3 +24,10 @@
 /* Until they use ELF or something that handles dwarf2 unwinds
    and initialization stuff better.  */
 #define DWARF2_UNWIND_INFO 0
+
+/* BSD/OS 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))