diff --git a/ChangeLog b/ChangeLog
index 891549369..29a63208f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2924357 [operations] Cannot rename a database that has foreign key
   constraints
 - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables
+- bug [browse] "Show BLOB contents" should display HTML code that is present
+  in a BLOB, thanks to Vincent van der Tuin
 
 3.2.4.0 (2009-12-02)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 80cf9245b..4f16ca58a 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1371,7 +1371,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                             	$row[$i] = bin2hex($row[$i]);
 							}
 							else {
-                            	$row[$i] = PMA_replace_binary_contents($row[$i]);
+                            	$row[$i] = htmlspecialchars(PMA_replace_binary_contents($row[$i]));
 							}
                         } else {
                             // we show the BINARY message and field's size
@@ -2266,7 +2266,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
             $result = $default_function($result, array(), $meta);
             if (stristr($meta->type, 'BLOB') && $_SESSION['tmp_user_values']['display_blob']) {
                 // in this case, restart from the original $content
-                $result = PMA_replace_binary_contents($content);
+                $result = htmlspecialchars(PMA_replace_binary_contents($content));
             }
         }
     }