diff --git a/ChangeLog b/ChangeLog
index 38e7dd4719..bec2a8fdf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep  1 19:37:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* tool/transcode-tblgen.rb: ValidEncoding['eucJP-ms'] defined.
+	  "\xA2\xAF".encode("utf-8", "eucJP-ms") should raise
+	  Encoding::ConversionUndefined, not Encoding::InvalidByteSequence.
+
 Mon Sep  1 18:27:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (gettimeofday): shouldn't use mktime(3) because it's
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index fe84703ce6..a09bf7ba0b 100644
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -667,6 +667,7 @@ ValidEncoding = {
   'ISO-8859-14' => '1byte',
   'ISO-8859-15' => '1byte',
   'Windows-31J' => 'Shift_JIS',
+  'eucJP-ms'    => 'EUC-JP'
 }.each {|k, v|
   ValidEncoding[k] = ValidEncoding.fetch(v)
 }