diff --git a/ChangeLog b/ChangeLog
index c7cede049d..7efab002b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 18 13:06:37 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
+
 Mon Feb 18 11:51:19 2008  Tanaka Akira  <akr@fsij.org>
 
 	* re.c (re_warn): defined to restore warnings for /[a-c-e]/, etc.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 4b8c4d2307..855be31052 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -26,7 +26,7 @@ module IRB
 
     def lc2kconv(lang)
       case lang
-      when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
+      when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP", "ja_JP.EUC-JP"
         Kconv::EUC
       when "ja_JP.sjis", "ja_JP.SJIS"
         Kconv::SJIS