diff --git a/ChangeLog b/ChangeLog
index fd38bc8af..7d842eaff 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ $Source$
     * server_privileges.php: patch #1249363, remove unneeded wordwrap(),
       table width should be limited by template if necessary,
       thanks to Sebastian Mendel - cybot_tm
+    * server_databases.php: patch #1249371, correct calculation of colspan,
+      thanks to Sebastian Mendel;
+      also,  $dbstats should contain 0 or 1, not the colspan
 
 2005-08-01 Michal Čihař  <michal@cihar.com>
     * lang/czech: Fix bad translation (is was translated to is not :-)),
diff --git a/server_databases.php b/server_databases.php
index 249412a88..bfd2d38fa 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -334,9 +334,9 @@ if (count($statistics) > 0) {
            . '        </tr>' . "\n";
     }
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
-        $common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . (empty($dbstats) ? '10' : '3');
+        $common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . (empty($dbstats) ? '0' : '1');
         echo '    <tr>' . "\n"
-           . '        <td colspan="' . (empty($dbstats) ? '10' : '3') . '">' . "\n"
+           . '        <td colspan="' . (!empty($dbstats) ? '10' : '3') . '">' . "\n"
            . '            <img src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" border="0" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n"
            . '            <a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="setCheckboxes(\'dbStatsForm\', true); return false;">' . "\n"
            . '                ' . $strCheckAll