diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 638d09eea6e..0b7c223c258 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1258,7 +1258,10 @@
 ;;; Setting word boundary.
 
 (setq word-combining-categories
-      '((?l . ?l)))
+      '((?l . ?l)
+	(?C . ?C)
+	(?C . ?H)
+	(?C . ?K)))
 
 (setq word-separating-categories	;  (2-byte character sets)
       '((?A . ?K)			; Alpha numeric - Katakana