diff --git a/ChangeLog b/ChangeLog
index cdf308adf..687470fd7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ $Source$
     * libraries/auth/cookie.auth.lib.php: for auth_type='cookie', avoid
       showing the "cookies must be enabled" message if they are enabled
     * Documentation.html: requirements: web browser with cookies enabled
+    * libraries/header.inc.php: show message about cookies also
+      when auth_type = http or config
 
 2006-05-31 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1498108, support twice the separator
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index dabca93ca..17411032d 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -141,6 +141,13 @@ if (empty($GLOBALS['is_header_sent'])) {
     // Include possible custom headers
     require_once './libraries/header_custom.inc.php';
 
+    // message of "Cookies required" displayed for auth_type http or config
+    // note: here, the decoration won't work because without cookies,
+    // our standard CSS is not operational
+    if (empty($_COOKIE)) {
+         echo '<div class="notice">' . $GLOBALS['strCookiesRequired'] . '</div>' . "\n";
+    }
+
     if (!defined('PMA_DISPLAY_HEADING')) {
         define('PMA_DISPLAY_HEADING', 1);
     }