diff --git a/sites/all/libraries/geshi/geshi.php b/sites/all/libraries/geshi/geshi.php
index c6ff9ef..cb944e4 100644
--- a/sites/all/libraries/geshi/geshi.php
+++ b/sites/all/libraries/geshi/geshi.php
@@ -2161,6 +2161,16 @@ class GeSHi {
         $code = str_replace("\r\n", "\n", $this->source);
         $code = str_replace("\r", "\n", $code);
 
+        // Hack for "CKEditor and GeSHiFilter":
+        $code = str_replace(">", ">", $code);
+        $code = str_replace("&lt;", "<", $code);
+        $code = str_replace("&rsaquo;", "›", $code);
+        $code = str_replace("&lsaquo;", "‹", $code);
+        $code = str_replace("&#39;", "'", $code);
+        $code = str_replace("&quot;", "\"", $code);
+        $code = str_replace("&amp;", "&", $code);
+        // End Hack.
+
         // Firstly, if there is an error, we won't highlight
         if ($this->error) {
             //Escape the source for output
@@ -4772,4 +4782,4 @@ if (!function_exists('geshi_highlight')) {
     }
 }
 
-?>
\ No newline at end of file
+?>