diff --git a/ChangeLog b/ChangeLog
index 9d4ead37a1..fbfe54c3d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - issue #12293 Fix MySQL SSL connection with some PHP versions
 - issue #12279 Fix MySQL connection error on version mismatch
 - issue #12281 Keep user attributes (privileges, authentication mode, etc) when copying a user
+- issue #12308 Fix division by zero in case of misconfigured MySQL server
 
 4.6.2 (2016-05-25)
 - issue        [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14
diff --git a/libraries/ServerStatusData.php b/libraries/ServerStatusData.php
index c47defcdf7..477b155ca8 100644
--- a/libraries/ServerStatusData.php
+++ b/libraries/ServerStatusData.php
@@ -220,6 +220,7 @@ class ServerStatusData
         if (isset($server_status['Key_blocks_unused'])
             && isset($server_variables['key_cache_block_size'])
             && isset($server_variables['key_buffer_size'])
+            && $server_variables['key_buffer_size'] != 0
         ) {
             $server_status['Key_buffer_fraction_%']
                 = 100
@@ -229,6 +230,7 @@ class ServerStatusData
                 * 100;
         } elseif (isset($server_status['Key_blocks_used'])
             && isset($server_variables['key_buffer_size'])
+            && $server_variables['key_buffer_size'] != 0
         ) {
             $server_status['Key_buffer_fraction_%']
                 = $server_status['Key_blocks_used']