diff --git a/ChangeLog b/ChangeLog
index 2d5cc03f9..79c6d2e69 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ $Source$
       libraries/footer.inc.php, libraries/footer_custom.inc.php,
       libraries/header.inc.php, libraries/header_custom.inc.php,
       libraries/auth/cookie.auth.lib.php, libraries/auth/http.auth.lib.php:
-      Header and footer per themes (RFE #984152),
+      Header and footer per themes (RFE #984152) [this part removed later],
       config.{header,footer}.inc.php files are now optional.
     * libraries/select_lang.lib.php: Fix undefined indexes.
     * */.cvsignore: Ignore custom headers and temporary files from Vim.
diff --git a/Documentation.html b/Documentation.html
index 1955a668d..70d401aa4 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -2899,8 +2899,6 @@ RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
         <li>edit <tt>layout.inc.php</tt> in &quot;your_theme_name&quot;</li>
         <li>edit <tt>info.inc.php</tt> in &quot;your_theme_name&quot; to
         contain your chosen theme name, that will be visible in user interface</li>
-        <li>optionally you can add header.inc.php and footer.inc.php files
-        that will be included in header and footer of each page</li>
         <li>make a new screenshot of your theme and save it under &quot;your_theme_name/screen.png&quot;</li>
     </ul>
     <br />
diff --git a/libraries/footer_custom.inc.php b/libraries/footer_custom.inc.php
index 87c31671a..6dc3bda26 100644
--- a/libraries/footer_custom.inc.php
+++ b/libraries/footer_custom.inc.php
@@ -8,9 +8,4 @@
 if (file_exists('./config.footer.inc.php')) {
     require('./config.footer.inc.php');
 }
-
-// Include theme footer
-if (file_exists($GLOBALS['pmaThemePath'] . 'footer.inc.php')) {
-    require($GLOBALS['pmaThemePath'] . 'footer.inc.php');
-}
 ?>
diff --git a/libraries/header_custom.inc.php b/libraries/header_custom.inc.php
index b8bca3b52..ad96a6620 100644
--- a/libraries/header_custom.inc.php
+++ b/libraries/header_custom.inc.php
@@ -4,11 +4,6 @@
 
 // This file includes all custom headers if they exist.
 
-// Include theme header
-if (file_exists($GLOBALS['pmaThemePath'] . 'header.inc.php')) {
-    require($GLOBALS['pmaThemePath'] . 'header.inc.php');
-}
-
 // Include site header
 if (file_exists('./config.header.inc.php')) {
     require('./config.header.inc.php');