diff --git a/ChangeLog b/ChangeLog
index 16bc34579..e4c48742a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ $Source$
     * libraries/grab_globals.lib.php: Do not choke on arrays in $_SERVER 
       array (bug #1370414).
     * libraries/sql_query_form.lib.php: Require bookmark code when we use it.
+    * libraries/export/sql.php: Backquote database name (RFE#1376336).
 
 2005-12-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/tbl_move_copy.php: added PMA_table_rename()
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index d83420357..e39ac6a10 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -123,6 +123,9 @@ function PMA_exportDBCreate($db) {
     }
     $create_query .= ';' . $crlf;
     if (!PMA_exportOutputHandler($create_query)) return FALSE;
+    if (isset($GLOBALS['use_backquotes']) && PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compat']) && $GLOBALS['sql_compat'] == 'NONE') {
+        return PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
+    }
     return PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
 }