diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9d98f75ed3..5ee5bbf73c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* config/tc-i386.c: Protect definitions of true and false
+	from redefinition.
+
 2002-01-28  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/obj-elf.c (elf_frob_file_before_adjust): Remove symbols
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index c81f87027c..650621feeb 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -48,8 +48,12 @@
 #define SCALE1_WHEN_NO_INDEX 1
 #endif
 
+#ifndef true
 #define true 1
+#endif
+#ifndef false
 #define false 0
+#endif
 
 static unsigned int mode_from_disp_size PARAMS ((unsigned int));
 static int fits_in_signed_byte PARAMS ((offsetT));