diff --git a/ChangeLog b/ChangeLog
index 4838451ea..f3b4e059b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Polish update, thanks to Fixer - fixeron
 - bug #2568722 [designer] Compound key not shown 
 - patch #2550323 [XHTML] in server_databases.php, thanks to Virsacer - virsacer
+- patch #2358861 [navi] Row count tooltip wrong for information_schema, 
+  thanks to Herman van Rink - helmo 
 
 3.1.2.0 (2009-01-19)
 - bug #1253252 [display] Can't NULL a column with relation defined 
diff --git a/db_structure.php b/db_structure.php
index 9d5cc4f97..49b97d595 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -225,6 +225,11 @@ foreach ($tables as $keyname => $each_table) {
         case 'ISAM' :
         case 'HEAP' :
         case 'MEMORY' :
+            if ($db_is_information_schema) {
+                $each_table['Rows'] = PMA_Table::countRecords($db,
+                    $each_table['Name'], $return = true);
+            }
+             
             if ($is_show_stats) {
                 $tblsize                    =  doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']);
                 $sum_size                   += $tblsize;
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index da0f66d0a..f46dce54d 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -784,14 +784,15 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
             // Do not check exact row count here,
             // if row count is invalid possibly the table is defect
             // and this would break left frame;
-            // but we can check row count if this is a view,
+            // but we can check row count if this is a view or the
+            // information_schema database
             // since PMA_Table::countRecords() returns a limited row count
             // in this case.
 
             // set this because PMA_Table::countRecords() can use it
             $tbl_is_view = PMA_Table::isView($db, $table['Name']);
 
-            if ($tbl_is_view) {
+            if ($tbl_is_view || 'information_schema' == $db) {
                 $table['Rows'] = PMA_Table::countRecords($db, $table['Name'],
                         $return = true);
             }