diff --git a/ChangeLog b/ChangeLog
index 8f3db452b..dea58bcdd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       remove a user did not work under MySQL 4.1.x (only mode 2 worked),
       so I remove them from the dialog. Thanks to Ken Stanley for
       the bug report.
+    * server_status.php: patch #1395031, not proper URL encoding,
+      adapted from proposed solution by Matt LaPlante, thanks
 
 2006-01-02 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_create_table.lib.php: bug #1389868, 
diff --git a/server_status.php b/server_status.php
index 0756bca0b..73278e65d 100644
--- a/server_status.php
+++ b/server_status.php
@@ -266,7 +266,7 @@ $links['repl']['MySQL - ' . $strDocu]
     = $cfg['MySQLManualBase'] . '/replication.html';
 
 $links['qcache'][$strFlushQueryCache]
-    = $PHP_SELF . '?flush=QUERY CACHE&amp;' . 
+    = $PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&amp;' . 
       PMA_generate_common_url();
 $links['qcache']['MySQL - ' . $strDocu]
     = $cfg['MySQLManualBase'] . '/query-cache.html';