diff --git a/ChangeLog b/ChangeLog
index 0651768aa..fbb729d98 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-02-02 Alexander M. Turek  <supposedformerinfatuationjunkie@derrabus.de>
+    * libraries/mysql_charsets.lib.php: Use PMA_backquote().
+
 2004-01-31 Michal Cihar  <whyisitsocold@cihar.com>
     * lang/czech: Update.
 
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 841fd2093..ab5f07104 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -231,7 +231,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
             // MySQL 4.1.0 does not support seperate charset settings
             // for databases.
 
-            $res = PMA_DBI_query('SHOW CREATE DATABASE `' . $db . '`;');
+            $res = PMA_DBI_query('SHOW CREATE DATABASE ' . PMA_backquote($db) . ';');
             $row = PMA_DBI_fetch_row($res);
             PMA_DBI_free_result($res);
             PMA_DBI_free_result($res);