diff --git a/ChangeLog b/ChangeLog
index 24eeffdc9..fa148e927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2727250 Optimizations for PHP loops
   thanks to Haeber 
 - bug #2650776 [import] SQL_MODE not saved during Partial Import 
+- patch #1863739 [auth] cache control missing (PHP-CGI), thanks to stmfd
 
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 1b2d3501d..70484d278 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -684,6 +684,10 @@ function PMA_auth_fails()
         $conn_error = $GLOBALS['strCannotLogin'];
     }
 
+    // needed for PHP-CGI (not need for FastCGI or mod-php)
+    header('Cache-Control: no-store, no-cache, must-revalidate');
+    header('Pragma: no-cache');
+
     PMA_auth();
 } // end of the 'PMA_auth_fails()' function