diff --git a/ChangeLog b/ChangeLog
index 12c857a2f1..f8e710fdc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 16 20:13:00 2010  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enc/trans/emoji.trans: added codepoints leading 0xf4 into
+	  nomap_table.
+
 Tue Mar 16 17:33:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (VpCtoV): keep e's sign.
diff --git a/enc/trans/emoji.trans b/enc/trans/emoji.trans
index cb930b51c7..91bbaf499a 100644
--- a/enc/trans/emoji.trans
+++ b/enc/trans/emoji.trans
@@ -12,6 +12,7 @@
     ["{ee-ef}{80-bf}{80-bf}", :nomap0],
     ["f0{90-bf}{80-bf}{80-bf}", :nomap0],
     ["{f1-f3}{80-bf}{80-bf}{80-bf}", :nomap0],
+    ["f4{80-8f}{80-bf}{80-bf}", :nomap0],
   ]
 
   companies = %w(DoCoMo KDDI SoftBank Unicode)