diff --git a/ChangeLog b/ChangeLog
index 9bfd342ef..57bf4ba18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1848889 [export] export trigger should use DROP TRIGGER IF EXISTS
 - bug #1851833 [display] Sorting forgets an explicit LIMIT
  (fix for sorting on column headers)
+- bug #1764182 [cookies] Suhosin cookie encryption breaks phpMyAdmin
 
 2.11.3.0 (2007-12-08)
 - patch #1818389 to remove a notice (failed to flush buffer), thanks to
diff --git a/libraries/mcrypt.lib.php b/libraries/mcrypt.lib.php
index 27db6c275..7d6d21cc3 100644
--- a/libraries/mcrypt.lib.php
+++ b/libraries/mcrypt.lib.php
@@ -11,12 +11,11 @@
  * further decryption. I don't think necessary to have one iv
  * per server so I don't put the server number in the cookie name.
  */
-if (!isset($_COOKIE['pma_mcrypt_iv'])) {
+if (empty($_COOKIE['pma_mcrypt_iv'])
+ || false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv']))) {
     srand((double) microtime() * 1000000);
     $iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_BLOWFISH, MCRYPT_MODE_CBC), MCRYPT_RAND);
     PMA_setCookie('pma_mcrypt_iv', base64_encode($iv));
-} else {
-    $iv = base64_decode($_COOKIE['pma_mcrypt_iv']);
 }
 
 /**