diff --git a/ChangeLog b/ChangeLog
index 8a54fac90..1bfb4ad1b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ $Source$
 	  fixed bug #536550 - DOCTYPE line contains line feeds.
 	* lang/brazilian_portuguese.inc.php3: restored.
 	* lang/french.inc.php3: resorted.
+	* Documentation.html, line 71: little xhtml1.0 fix.
+	* sql.php3, line 367: urlencoded the message passed with the location
+	  header. Thanks to Severus <theseverus at users.sourceforge.net>.
 
 2002-03-29 Loïc Chapeaux  <lolo@phpheaven.net>
 	* sql.php3, lines 456-457: swap form fields position for consistency
diff --git a/sql.php3 b/sql.php3
index 495ccc908..cfe00e42b 100755
--- a/sql.php3
+++ b/sql.php3
@@ -364,7 +364,7 @@ else {
             include('./' . $goto);
         } // end if file_exist
         else {
-            header('Location: ' . $cfgPmaAbsoluteUri . str_replace('&amp;', '&', $goto) . '&message=' . $message);
+            header('Location: ' . $cfgPmaAbsoluteUri . str_replace('&amp;', '&', $goto) . '&message=' . urlencode($message));
         } // end else
         exit();
     } // end no rows returned