diff --git a/ChangeLog b/ChangeLog
index c51f913ff..06ea1d1d3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-11-06 Michal Cihar  <nijel@users.sourceforge.net>
+    * libraries/export/xml.php3: Add xml header with encoding information 
+      (bug #836630).
+
 2003-11-05 Garvin Hicking <me@supergarv.de>
     * libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not 
       store queries with errors in history, also when coming from the 
diff --git a/libraries/export/xml.php3 b/libraries/export/xml.php3
index d4e34b635..14ea20f4a 100644
--- a/libraries/export/xml.php3
+++ b/libraries/export/xml.php3
@@ -28,7 +28,14 @@ function PMA_exportHeader() {
     global $crlf;
     global $cfg;
     
-    $head  =  '<!--' . $crlf
+    if ($GLOBALS['output_charset_conversion']) {
+        $charset = $GLOBALS['charset_of_file'];
+    } else {
+        $charset = $GLOBALS['charset'];
+    }
+
+    $head  =  '<?xml version="1.0" encoding="' . $charset . '" ?>' . $crlf
+           .  '<!--' . $crlf
            .  '-' . $crlf
            .  '- phpMyAdmin XML Dump' . $crlf
            .  '- version ' . PMA_VERSION . $crlf