diff --git a/ChangeLog b/ChangeLog
index a3cd4981d..29b16e525 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-05-10 Marc Delisle  <lem9@users.sourceforge.net>
+     * libraries/display_tbl.lib.php3: bug 735439: if too many page numbers,
+       show just the pages near the current page
+
 2003-05-10 Michal Cihar  <nijel@users.sourceforge.net>
      * libraries/common.lib.php3: Whole tab is now link.
      * libraries/display_export.lib.php3: Disable CSV export for multiple
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 1c9b8fb30..3db90b15f 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -362,7 +362,15 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
 <select name="goToPage" onChange="goToUrl(this, '<?php echo "sql.php3?sql_query=".$encoded_query."&amp;session_max_rows=".$session_max_rows."&amp;disp_direction=".$disp_direction."&amp;repeat_cells=".$repeat_cells."&amp;goto=".$goto."&amp;dontlimitchars=".$dontlimitchars."&amp;".PMA_generate_common_url($db, $table)."&amp;"; ?>')">
 
            <?php
-            for ($i=1; $i<=$nbTotalPage; $i++){
+            if ($nbTotalPage < 200) {
+                $firstPage = 1;
+                $lastPage  = $nbTotalPage;
+            } else {
+                $range = 20;
+                $firstPage = ($pageNow - $range < 1 ? 1 : $pageNow - $range);
+                $lastPage  = ($pageNow + $range > $nbTotalPage ? $nbTotalPage : $pageNow + $range);
+            }
+            for ($i=$firstPage; $i<=$lastPage; $i++){
                 if ($i == $pageNow) {
                     $selected = 'selected="selected"';
                 } else {