diff --git a/ChangeLog b/ChangeLog
index 8c4aeebee..87e36765e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2005-02-23 Alexander M. Turek  <me@derrabus.de>
     * libraries/grab_globals.lib.php: More hotfixes against bug #1149381.
+    * libraries/mysql_charsets.lib.php: Detection for new Japanese charsets
+      (cp932 and eucjpms) that will be introduced with MySQL 5.0.3.
 
 2005-02-22 Alexander M. Turek  <me@derrabus.de>
     * libraries/grab_globals.lib.php: Hotfix against bug #1149381 and parts
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index fa79a479f..3d64a8f5b 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -197,6 +197,8 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
                     // Japanese charsets
                     case 'sjis':
                     case 'ujis':
+                    case 'cp932':
+                    case 'eucjpms':
                         $descr = $GLOBALS['strJapanese'];
                         break;
                     // Baltic charsets