diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfd96e19fe3..6edfb468241 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-15  Miles Bader  <miles@gnu.org>
+
+	* generic.el (generic-make-keywords-list): Use symbol rather than
+	word anchors in regexp.
+
 2004-09-14  Sean O'Rourke  <sorourke@cs.ucsd.edu>
 
 	* ibuf-ext.el (define-ibuffer-filter filename): If buffer has
diff --git a/lisp/generic.el b/lisp/generic.el
index ca4b47ff4b1..57937be6c0b 100644
--- a/lisp/generic.el
+++ b/lisp/generic.el
@@ -405,10 +405,10 @@ INI file.  This hook is NOT installed by default."
 The regexp is highlighted with FACE."
   (unless (listp keywords-list)
     (error "Keywords argument must be a list of strings"))
-  (list (concat prefix "\\<"
+  (list (concat prefix "\\_<"
 		;; Use an optimized regexp.
 		(regexp-opt keywords-list t)
-		"\\>" suffix)
+		"\\_>" suffix)
 	1
 	face))