diff --git a/gas/ChangeLog b/gas/ChangeLog
index 735fd4f688..8ee365e231 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-21  Andreas Schwab  <schwab@suse.de>
+
+	* config/tc-i386.h (NOP_OPCODE): Restore.
+
 2007-03-18  Mark Shinwell  <shinwell@codesourcery.com>
 
 	* config/tc-arm.c (do_mul): Don't warn about overlapping
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 0f84f59ab9..ed8085018b 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -114,6 +114,9 @@ extern const char *i386_comment_chars;
 #define IMMEDIATE_PREFIX '$'
 #define ABSOLUTE_PREFIX '*'
 
+/* Byte to use for filling in frag_align_code.  */
+#define NOP_OPCODE (char) 0x90
+
 /* these are the instruction mnemonic suffixes.  */
 #define WORD_MNEM_SUFFIX  'w'
 #define BYTE_MNEM_SUFFIX  'b'