diff --git a/ChangeLog b/ChangeLog
index 03555e601..4d121a335 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-03-25 Alexander M. Turek  <me@derrabus.de>
+    * libraries/engines/innodb.lib.php: Caught possible devision by zero.
+
 2005-03-25 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties.inc.php: bug #1170255, undefined index: Field
 
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index 8466d60cc..2e6b56d36 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -165,13 +165,13 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine {
                         . '                &nbsp;' . $GLOBALS['strBufferReadMissesInPercent'] . '&nbsp;' . "\n"
                         . '            </td>' . "\n"
                         . '            <td align="right" bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
-                        . '                ' . htmlspecialchars(number_format($status['Innodb_buffer_pool_reads'] * 100 / $status['Innodb_buffer_pool_read_requests'], 2, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator'])) . '&nbsp;%' . "\n"
+                        . '                ' . ($status['Innodb_buffer_pool_read_requests'] == 0 ? '---' : htmlspecialchars(number_format($status['Innodb_buffer_pool_reads'] * 100 / $status['Innodb_buffer_pool_read_requests'], 2, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator'])) . '&nbsp;%') . "\n"
                         . '            </td>' . "\n"
                         . '            <td bgcolor="' . $cfg['BgcolorOne'] . '">' . "\n"
                         . '                &nbsp;' . $GLOBALS['strBufferWriteWaitsInPercent'] . '&nbsp;' . "\n"
                         . '            </td>' . "\n"
                         . '            <td align="right" bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
-                        . '                ' . htmlspecialchars(number_format($status['Innodb_buffer_pool_wait_free'] * 100 / $status['Innodb_buffer_pool_write_requests'], 2, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator'])) . '&nbsp;%' . "\n"
+                        . '                ' . ($status['Innodb_buffer_pool_write_requests'] == 0 ? '---' : htmlspecialchars(number_format($status['Innodb_buffer_pool_wait_free'] * 100 / $status['Innodb_buffer_pool_write_requests'], 2, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator'])) . '&nbsp;%') . "\n"
                         . '            </td>' . "\n"
                         . '        </tr>' . "\n"
                         . '    </tbody>' . "\n"