diff --git a/ChangeLog b/ChangeLog
index c01977223..5ac1127c2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,11 @@ $Source$
     * libraries/import.lib.php: support display of HANDLER statement results
     * libraries/header.inc.php, libraries/auth/http.auth.lib.php,
       /cookie.auth.lib.php, removed header_custom.inc.php: 
-      patch #1502453, unnecessary disk access, thanks to Juergen Wind
+      patch #1502453, unnecessary disk access,
+      thanks to Juergen Wind (windkiel)
+    * libraries/footer.inc.php, libraries/auth/http.auth.lib.php,
+      /cookie.auth.lib.php, removed footer_custom.inc.php: 
+      applied the same optimization 
 
 2006-06-08 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/header.inc.php: bug #1501891, undefined PMA_isSuperuser() when 
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 8548447eb..6f0312538 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -146,7 +146,10 @@ echo sprintf( $GLOBALS['strWelcome'],
         </div>
 <?php
         echo '</div>' . "\n";
-        require './libraries/footer_custom.inc.php';
+        if (file_exists('./config.footer.inc.php')) {
+            require('./config.footer.inc.php');
+        }
+
         echo '    </body>' . "\n"
            . '</html>';
         exit();
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index 0c3b666af..7fe0ac43f 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -45,7 +45,10 @@ function PMA_auth() {
 <br />
 <div class="warning"><?php echo $GLOBALS['strWrongUser']; ?></div>
 
-<?php require './libraries/footer_custom.inc.php'; ?>
+<?php if (file_exists('./config.footer.inc.php')) {
+         require('./config.footer.inc.php');
+      }
+ ?>
 
 </body>
 </html>
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index de7acbea5..3702dac66 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -123,7 +123,10 @@ if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
 }
 
 // Include possible custom footers
-require_once './libraries/footer_custom.inc.php';
+if (file_exists('./config.footer.inc.php')) {
+    require('./config.footer.inc.php');
+}
+
 
 /**
  * Generates profiling data if requested
diff --git a/libraries/footer_custom.inc.php b/libraries/footer_custom.inc.php
deleted file mode 100644
index 6dc3bda26..000000000
--- a/libraries/footer_custom.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
-// This file includes all custom footers if they exist.
-
-// Include site footer
-if (file_exists('./config.footer.inc.php')) {
-    require('./config.footer.inc.php');
-}
-?>