diff --git a/ChangeLog b/ChangeLog
index 015f44c30..136ed52c3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
     * Documentation.html: update the persons/towns/countries example
     * sql.php3, tbl_properties_table_info.php3: sub-page links on browse
     * lang/japanese* updates, thanks to Yukihiro Kawada
+    * libraries/mysql_wrappers.lib.php3 patch #574009, charset
+      conversion for db names, thanks to Michal Cihar_
 
 2002-06-26 Olivier L. Müller  <om@omnis.ch>
     * tbl_change.php3: display the submit button every 15 lines:
diff --git a/libraries/mysql_wrappers.lib.php3 b/libraries/mysql_wrappers.lib.php3
index 08f391382..bb10ea140 100644
--- a/libraries/mysql_wrappers.lib.php3
+++ b/libraries/mysql_wrappers.lib.php3
@@ -66,9 +66,9 @@ if (!defined('PMA_MYSQL_WRAPPERS_LIB_INCLUDED')){
 
     function PMA_mysql_list_fields($database_name, $table_name, $link_identifier = FALSE) {
         if ($link_identifier != FALSE) {
-            return mysql_list_fields($database_name, PMA_convert_charset($table_name), $link_identifier);
+            return mysql_list_fields(PMA_convert_charset($database_name), PMA_convert_charset($table_name), $link_identifier);
         } else {
-            return mysql_list_fields($database_name, PMA_convert_charset($table_name));
+            return mysql_list_fields(PMA_convert_charset($database_name), PMA_convert_charset($table_name));
         }
     }