diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 66221d8ed2..f950874934 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Nick Kelsey  <nickk@ubicom.com>
+
+	* cgen-asm.c (cgen_parse_keyword): Added underscore to symbol character
+	check to fix false keyword trigger with names such as <keyword>_foo.
+
 2002-12-19  Doug Evans  <dje@sebabeach.org>
 
 	* Makefile.am (CGEN_CPUS): New variable.
diff --git a/opcodes/cgen-asm.c b/opcodes/cgen-asm.c
index 05b62bf49e..c71c70de08 100644
--- a/opcodes/cgen-asm.c
+++ b/opcodes/cgen-asm.c
@@ -225,7 +225,9 @@ cgen_parse_keyword (cd, strp, keyword_table, valuep)
   /* Allow letters, digits, and any special characters.  */
   while (((p - start) < (int) sizeof (buf))
 	 && *p
-	 && (ISALNUM (*p) || strchr (keyword_table->nonalpha_chars, *p)))
+	 && (ISALNUM (*p)
+	     || *p == '_'
+	     || strchr (keyword_table->nonalpha_chars, *p)))
     ++p;
 
   if (p - start >= (int) sizeof (buf))