diff --git a/ChangeLog b/ChangeLog
index bae0cd208e..8e98b5fd9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 14 22:38:31 2010  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: consider valid_encoding for max_input.
+
 Sun Mar 14 15:46:09 2010  Tanaka Akira  <akr@fsij.org>
 
 	* enc/trans/emoji.trans: fix nomap_table.
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index 14a09dbadf..f905590515 100755
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -633,6 +633,7 @@ def transcode_compile_tree(name, from, map)
 
   if ValidEncoding[from]
     valid_encoding = StrSet.parse(ValidEncoding[from])
+    max_input = [max_input, valid_encoding.max_length].max
   else
     valid_encoding = nil
   end