diff --git a/gas/ChangeLog b/gas/ChangeLog
index a0c0a7ff48..0dabaebade 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-01  Thiemo Seufer  <ths@networkno.de>
+
+	PR gas/1299
+	* Makefile.am: Disable -Werror for the itbl-lex.o rule.
+	* Makefile.in: Regenerate.
+
 2005-11-01  Thiemo Seufer  <ths@networkno.de>
 
 	* config/tc-mips.c (md_parse_option): Fix typo in comment.
diff --git a/gas/Makefile.am b/gas/Makefile.am
index ff7915a11b..17fc27ff83 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -623,7 +623,11 @@ bfin-lex.o: bfin-lex.c bfin-parse.h $(srcdir)/config/bfin-defs.h
 # The instruction table specification lexical analyzer and parser.
 
 itbl-lex.c: $(srcdir)/itbl-lex.l
+
+# Disable -Werror, if it has been enabled, since old versions of bison/
+# yacc will produce working code which contain compile time warnings. 
 itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
+	$(COMPILE) -c $< $(NO_WERROR)
 
 # Disable -Werror, if it has been enabled, since old versions of bison/
 # yacc will produce working code which contain compile time warnings. 
diff --git a/gas/Makefile.in b/gas/Makefile.in
index d7c33b8e67..9b13332487 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -2986,7 +2986,11 @@ bfin-lex.o: bfin-lex.c bfin-parse.h $(srcdir)/config/bfin-defs.h
 # The instruction table specification lexical analyzer and parser.
 
 itbl-lex.c: $(srcdir)/itbl-lex.l
+
+# Disable -Werror, if it has been enabled, since old versions of bison/
+# yacc will produce working code which contain compile time warnings. 
 itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
+	$(COMPILE) -c $< $(NO_WERROR)
 
 # Disable -Werror, if it has been enabled, since old versions of bison/
 # yacc will produce working code which contain compile time warnings.