diff --git a/ChangeLog b/ChangeLog
index 136ed52c3..1cbcf43f8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $Source$
 2002-06-26 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/czech-*.inc.php3: Shorter term for QBE, thanks again to
       Michal Cihar (nijel).
+    * header.inc.php3, header_printview.php3, left.php3,
+      libraries/auth/*.auth.lib.php3: Fixed bug #574025 (W3C validator didn't
+      detect character encoding).
 
 2002-06-26 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: update the persons/towns/countries example
diff --git a/header.inc.php3 b/header.inc.php3
index c0fac26a8..2db65d91b 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -48,6 +48,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 
 <head>
 <title>phpMyAdmin</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 <?php
 if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) {
     echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n";
@@ -94,17 +95,17 @@ a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff;
 .warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
 td.topline      {font-size: 1px}
 td.tab          {
-    border-top: 1px solid black; 
-    border-right: 1px solid black; 
-    border-left: 1px solid black; 
+    border-top: 1px solid black;
+    border-right: 1px solid black;
+    border-left: 1px solid black;
     border-bottom: none;
     border-radius: 2px;
     -moz-border-radius: 2px;
 }
 table.tabs      {
-    border-top: none; 
-    border-right: none; 
-    border-left: none; 
+    border-top: none;
+    border-right: none;
+    border-left: none;
     border-bottom: 2px solid gray;
 }
 //-->
diff --git a/header_printview.inc.php3 b/header_printview.inc.php3
index 7a5d1fd11..d41b1f17e 100644
--- a/header_printview.inc.php3
+++ b/header_printview.inc.php3
@@ -48,6 +48,7 @@ if ($text_dir == 'ltr') {
 
 <head>
 <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
 <style type="text/css">
 <!--
 body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff}
diff --git a/index.php3 b/index.php3
index 9491ea46b..ba7b41c21 100755
--- a/index.php3
+++ b/index.php3
@@ -49,6 +49,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 <style type="text/css">
 <!--
 body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
diff --git a/left.php3 b/left.php3
index 9e874223b..e0e1a46a7 100755
--- a/left.php3
+++ b/left.php3
@@ -62,6 +62,7 @@ PMA_setFontSizes();
 
 <head>
     <title>phpMyAdmin</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> target="phpmain" />
 <?php
 // Expandable/collapsible databases list is only used if there is more than one
diff --git a/libraries/auth/config.auth.lib.php3 b/libraries/auth/config.auth.lib.php3
index 3be9f8bb9..8b61233ad 100644
--- a/libraries/auth/config.auth.lib.php3
+++ b/libraries/auth/config.auth.lib.php3
@@ -95,6 +95,7 @@ if (!defined('PMA_CONFIG_AUTH_INCLUDED')) {
 
 <head>
 <title><?php echo $GLOBALS['strAccessDenied']; ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 <style type="text/css">
 <!--
 body     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
diff --git a/libraries/auth/cookie.auth.lib.php3 b/libraries/auth/cookie.auth.lib.php3
index 917a3eda9..b3872526f 100644
--- a/libraries/auth/cookie.auth.lib.php3
+++ b/libraries/auth/cookie.auth.lib.php3
@@ -93,6 +93,7 @@ if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
 
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 <base href="<?php echo $cfg['PmaAbsoluteUri']; ?>" />
 <style type="text/css">
 <!--
diff --git a/libraries/auth/http.auth.lib.php3 b/libraries/auth/http.auth.lib.php3
index 262cea730..444c3d286 100644
--- a/libraries/auth/http.auth.lib.php3
+++ b/libraries/auth/http.auth.lib.php3
@@ -38,6 +38,7 @@ if (!defined('PMA_HTTP_AUTH_INCLUDED')) {
 
 <head>
 <title><?php echo $GLOBALS['strAccessDenied']; ?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 <style type="text/css">
 <!--
 body     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
