diff --git a/ChangeLog b/ChangeLog
index be2a4585f..484c91d7c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-11  Steve Alberty  <alberty@neptunlabs.de>
+	* tbl_properties.php3: fix division by zero error
+
 2001-07-09  Loïc Chapeaux  <lolo@phpheaven.net>
 	* header.inc.php3: cosmetic changes.
 	* tbl_properties.php3, db_details.php3, functions.js: export the js work
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 573975b8b..2d1536083 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -257,7 +257,7 @@ if (MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 3 && $tbl_typ
     }
     list($effect_size, $effect_unit) = format_byte_down($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']);
     list($tot_size, $tot_unit)       = format_byte_down($showtable['Data_length'] + $showtable['Index_length']);
-    list($avg_size, $avg_unit)       = format_byte_down(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows']);
+    if (isset($showtable['Rows']) && $showtable['Rows']>0) list($avg_size, $avg_unit) = format_byte_down(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1);
 
     // Displays them
     if ($index_count > 0) {