diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89811bfaab8..774c3c62606 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-27  Kenichi Handa  <handa@m17n.org>
+
+	* international/characters.el: Set category 'C' to characters
+	#x20000..#x2AFFF, #x2F800..#x2FFFF.
+
+	* loadup.el: Set inhibit-load-charset-map to t while preloading
+	files.
+
 2008-11-27  Chong Yidong  <cyd@stupidchicken.com>
 
 	* tool-bar.el (tool-bar-find-image-cache): Var deleted.
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 01bc6c76d3f..3f6656dff27 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -138,6 +138,8 @@ Combining diacritic or mark")
 (modify-category-entry '(#xF900 . #xFAFF) ?|)
 (modify-category-entry '(#x20000 . #x2AFFF) ?|)
 (modify-category-entry '(#x2F800 . #x2FFFF) ?|)
+(modify-category-entry '(#x20000 . #x2AFFF) ?C)
+(modify-category-entry '(#x2F800 . #x2FFFF) ?C)
 
 
 ;; Chinese character set (GB2312)