diff --git a/ChangeLog b/ChangeLog
index 782ea656b..0e541335b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ $Id$
 $Source$
 
 2001-05-11  Loïc Chapeaux  <lolo@phpheaven.net>
+	* lib.inc.php3, lines 76, 81 and 612: fixed a bug if a field contains html
+	  tags (suggested by Olivier Bussier at the phpMyAdmin official forum:
+	  http://www.phpwizard.net/phorum/read.php?f=1&i=3349&t=3349)
+	  set_time_limit() function (Feature #423374)
 	* lib.inc.php3, lines 496 & 563: put an "@" in front of the calls to the
 	  set_time_limit() function (Feature #423374)
 	* main.php3: add some empty lines to beautify the start screen and a test that
diff --git a/lib.inc.php3 b/lib.inc.php3
index 09ecb16bf..a8db58072 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -73,12 +73,12 @@ function mysql_die($error = "") {
     echo "<b> $strError </b><p>";
     if(isset($sql_query) && !empty($sql_query))
     {
-        echo "$strSQLQuery: <pre>$sql_query</pre><p>";
+        echo "$strSQLQuery: <pre>".htmlspecialchars($sql_query)."</pre><p>";
     }
     if(empty($error))
-        echo $strMySQLSaid.mysql_error();
+        echo "$strMySQLSaid ".mysql_error();
     else
-        echo $strMySQLSaid.$error;
+        echo "$strMySQLSaid ".htmlspecialchars($error);
     echo "\n<br><a href=\"javascript:history.go(-1)\">$strBack</a>";
     include("footer.inc.php3");
     exit;
@@ -609,7 +609,7 @@ function show_message($message) {
         ?>
         <tr>
         <td bgcolor="<?php echo $GLOBALS['cfgBgcolorOne'];?>">
-        <?php echo $GLOBALS['strSQLQuery'].":\n<br>", nl2br($GLOBALS['sql_query']);
+        <?php echo $GLOBALS['strSQLQuery'].":\n<br>", nl2br(htmlspecialchars($GLOBALS['sql_query']));
         if (isset($GLOBALS["sql_order"])) echo " $GLOBALS[sql_order]";
         if (isset($GLOBALS["pos"])) echo " LIMIT $GLOBALS[pos], $GLOBALS[cfgMaxRows]";?>
         </td>