diff --git a/ChangeLog b/ChangeLog
index 58d67e503..92bc2df2f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-08-28 Michal Cihar  <nijel@users.sourceforge.net>
+    * libraries/display_export.lib.php3: Allow xml to be also default export
+      (bug #796706).
+    
 2003-08-27 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_relation.php3: User forgot to define an index on the master table
       before adding a foreign key constraint: trap the error, warn the user
diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3
index 4d0a128fd..0bf893fac 100644
--- a/libraries/display_export.lib.php3
+++ b/libraries/display_export.lib.php3
@@ -23,6 +23,7 @@ function PMA_exportIsActive($what, $val) {
 <?php
 $hide_structure = false;
 $hide_sql       = false;
+$hide_xml       = empty($db);
 if ($export_type == 'server') {
     echo PMA_generate_common_hidden_inputs('', '', 1);
 } elseif ($export_type == 'database') {
@@ -88,7 +89,9 @@ if (isset($sql_query)) {
             <!-- General CSV -->
             <input type="radio" name="what" value="csv" id="radio_dump_csv"  onclick="if(this.checked) { hide_them_all(); getElement('csv_options').style.display = 'block'; }; return true" <?php PMA_exportIsActive('format', 'csv'); ?> />
             <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>
-<?php if (!empty($db)) { ?>
+
+
+<?php if (!$hide_xml) { ?>
             <br /><br />
 
             <!-- XML -->
@@ -370,6 +373,10 @@ if ($cfgRelation['mimework']) {
 <?php if (!$hide_sql) { ?>
                 } else if (getElement('radio_dump_sql').checked) {
                     getElement('sql_options').style.display = 'block';
+<?php } ?>
+<?php if (!$hide_xml) { ?>
+                } else if (getElement('radio_dump_xml').checked) {
+                    getElement('none_options').style.display = 'block';
 <?php } ?>
                 } else if (getElement('radio_dump_csv').checked) {
                     getElement('csv_options').style.display = 'block';