diff --git a/ChangeLog b/ChangeLog
index 06586899a..1a3b964cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Norman Hippert
 - [structure] do not remove the BINARY attribute in drop-down 
 - bug #1955386 [session] Overriding session.hash_bits_per_character 
+- [interface] sanitize the table comments in table print view, 
+  thanks to Norman Hippert
 
 2.11.6.0 (2008-04-29)
 - bug #1903724 [interface] Displaying of very large queries in error message 
diff --git a/tbl_printview.php b/tbl_printview.php
index 873785f83..778e5e1f6 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -148,7 +148,7 @@ foreach ($the_tables as $key => $table) {
      * Displays the comments of the table if MySQL >= 3.23
      */
     if (!empty($show_comment)) {
-        echo $strTableComments . ': ' . $show_comment . '<br /><br />';
+        echo $strTableComments . ': ' . htmlspecialchars($show_comment) . '<br /><br />';
     }
 
     /**