diff --git a/ChangeLog b/ChangeLog
index f6d64fc0d..d69b52ff3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-12-15 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html, libraries/common.lib.php, config.default.php:
+      bug #1615313, doc referred to HTTP so enable the code to accept
+      either HTTP or http as auth_type
+
 2006-12-12 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/Table.class.php: problem changing a TIMESTAMP to DEFAULT 0
     * tbl_change.php: bug #1610314, detection of binary column
diff --git a/Documentation.html b/Documentation.html
index 11d30d807..f638b0dc0 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -653,7 +653,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
         &quot;stduser/stdpass&quot;.</dd>
 
     <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string
-        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'cookie'|'config']</tt></dt>
+        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config']</tt></dt>
     <dd>Whether config or cookie or
         <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication
         should be used for this server.
@@ -668,7 +668,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
                 ends. This can also allow you to log in in arbitrary server if
                 <tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled.
             </li>
-            <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions)
+            <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions and can be written also as 'http')
                 (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
                 allows you to log in as any valid MySQL user via HTTP-Auth.</li>
         </ul>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 21a42d89c..59fa7095c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3195,6 +3195,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // (for a quick check of path disclosure in auth/cookies:)
         $coming_from_common = true;
 
+        // to allow HTTP or http
+        $cfg['Server']['auth_type'] = strtolower($cfg['Server']['auth_type']);
         if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
             header('Location: error.php'
                     . '?lang='  . urlencode($available_languages[$lang][2])
diff --git a/libraries/config.default.php b/libraries/config.default.php
index b17691fac..233d9f046 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -68,7 +68,7 @@ $cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP or cookie)
 $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)