diff --git a/ChangeLog b/ChangeLog
index 6a7a03d7b..d646e3a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Norwegian update, thanks to Sven-Erik Andersen 
 + [lang] Italian update, thanks to Luca Rebellato 
 + [lang] Spanish update, thanks to Daniel Hinostroza 
+. [export] Do not obey $cfg['MaxTableList'] on database export
 
 2.10.3.0 (2007-07-20)
 
diff --git a/Documentation.html b/Documentation.html
index ae47cd686..4e22e337b 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1092,7 +1092,7 @@ ALTER TABLE `pma_column_comments`
 	
     <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt>
     <dd>The maximum number of table names to be displayed in the
-    main panel's list. This limit is also enforced in the navigation panel 
+    main panel's list (except on the Export page). This limit is also enforced in the navigation panel 
     when in Light mode.</dd>
 
     <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] integer</dt>
diff --git a/db_export.php b/db_export.php
index 89bce317e..24064a723 100644
--- a/db_export.php
+++ b/db_export.php
@@ -15,6 +15,8 @@
  */
 require_once './libraries/common.inc.php';
 
+// $sub_part is also used in db_info.inc.php to see if we are coming from 
+// db_export.php, in which case we don't obey $cfg['MaxTableList']
 $sub_part  = '_export';
 require_once './libraries/db_common.inc.php';
 $url_query .= '&amp;goto=db_export.php';
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 47edbb68b..ab927ccb4 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -4,7 +4,7 @@
  * Gets the list of the table in the current db and informations about these
  * tables if possible
  *
- * fills tooltip arrays and rovides $tables, $num_tables, $is_show_stats
+ * fills tooltip arrays and provides $tables, $num_tables, $is_show_stats
  * and $db_is_information_schema
  *
  * staybyte: speedup view on locked tables - 11 June 2001
@@ -205,8 +205,19 @@ if (! isset($sot_ready)) {
         // - get the total number of tables
         $tables = PMA_DBI_get_tables($db);
         $total_num_tables = count($tables);
-        // - then fetch the details for a possible limited subset
-        $tables = PMA_DBI_get_tables_full($db, false, false, null, $pos, true);
+        if ($sub_part !== '_export') {
+            // - then fetch the details for a possible limited subset
+            $tables = PMA_DBI_get_tables_full($db, false, false, null, $pos, true);
+        } else {
+            // (unless we are coming from db_export.php, because I think it's
+            // too risky to display only a subset of the table names
+            // when exporting a db)
+            /**
+             *
+             * @todo Page selector for table names?
+             */
+            $tables = PMA_DBI_get_tables_full($db, false, false, null, 0, false);
+        }
     }
 
     if ($cfg['ShowTooltip']) {