diff --git a/ChangeLog b/ChangeLog
index f51421e3e..96a993fec 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $Source$
       form.
     * libraries/display_select_lang.lib.php, libraries/select_lang.lib.php:
       Show native names of languages (RFE #1342726).
+    * libraries/auth/cookie.auth.lib.php: Try to load mcrypt extension.
 
 2005-11-20 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * added test/theme.php: for testing themes
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 27d0df9d4..140b9cb58 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -21,8 +21,7 @@ $current_time  = time();
 
 // Uses faster mcrypt library if available
 // (Note: mcrypt.lib.php needs $cookie_path and $is_https)
-// TODO: try to load mcrypt?
-if (function_exists('mcrypt_encrypt')) {
+if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
     require_once('./libraries/mcrypt.lib.php');
 } else {
     require_once('./libraries/blowfish.php');