diff --git a/admin/ChangeLog b/admin/ChangeLog
index 299190bb2a7..8e3a484f1f1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-09  Kenichi Handa  <handa@m17n.org>
+
+	* unidata/unidata-gen.el (unidata-describe-decomposition): Return
+	a string with a composition property to disable combining
+	characters being composed.
+
 2009-03-11  Miles Bader  <Miles Bader <miles@gnu.org>>
 
 	* quick-install-emacs: Be more clever about locating info directory.
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index d82ba7aa432..5a03fd71431 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1134,8 +1134,13 @@ Property value is a character."
 	       (ON . "Other Neutrals")))))
 
 (defun unidata-describe-decomposition (val)
-  (mapconcat #'(lambda (x) (if (symbolp x) (symbol-name x) (string ?' x ?')))
-	     val " "))
+  (mapconcat
+   #'(lambda (x)
+       (if (symbolp x) (symbol-name x)
+	 (concat (string ?')
+		 (compose-string (string x) 0 1 (string ?\t x ?\t))
+		 (string ?'))))
+   val " "))
 
 ;; Verify if we can retrieve correct values from the generated
 ;; char-tables.