diff --git a/ChangeLog b/ChangeLog
index 93ea55044..c1528f5b6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,8 +17,9 @@ $Source$
 	  language dependant.
 	* tbl_properties.inc.php3: removed an unnecessary php closing tag and
 	  commited some cosmetic changes.
-	* lib.inc.php3, lines 946-950; db_details.php3, lines 96 & 118; language
-	  files: thousands and decimal separators are now language dependant.
+	* lib.inc.php3, lines 706 & 946-950; db_details.php3, lines 96 & 118;
+	  language files: thousands and decimal separators are now language
+	  dependant.
 	* tbl_dump.php3, lines 78: Added a '#' before 'No tables found' so the
 	  generated dump file may be imported later even if there is no table.
 	* db_printview.php3, line 29: Cosmetic change in column case name.
diff --git a/lib.inc.php3 b/lib.inc.php3
index e7fd41466..3de881ef5 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -699,12 +699,11 @@ function get_table_content_old($db, $table, $handler)
     return (true);
 }
 
-function count_records ($db,$table)
+function count_records($db, $table)
 {
-    $result = mysql_query("select count(*) as num from ".db_name($db)."." .
-	tbl_name($table));
-    $num = mysql_result($result,0,"num");
-    echo $num;
+    $result = mysql_query('select count(*) as num from ' . db_name($db) . '.' . tbl_name($table));
+    $num    = mysql_result($result,0,"num");
+    echo number_format($num, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
 }
 
 // Get the content of $table as a CSV output.