diff --git a/ChangeLog b/ChangeLog
index ed9c59300..8027c6efd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-24 Michal Čihař  <michal@cihar.com>
+    * main.php, changelog.php: Add headers to ChangeLog display.
+    
 2004-06-23 Marc Delisle  <lem9@users.sourceforge.net>
     * many files: remove references to older /images, and
       erase /images contents
diff --git a/changelog.php b/changelog.php
new file mode 100644
index 000000000..5033c4195
--- /dev/null
+++ b/changelog.php
@@ -0,0 +1,8 @@
+<?php
+// Simple script to set correct charset for changelog
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+header('Content-type: text/plain; charset=utf-8');
+readfile('ChangeLog');
+?>
diff --git a/main.php b/main.php
index 05557f746..1ecc9e550 100644
--- a/main.php
+++ b/main.php
@@ -649,7 +649,7 @@ echo "\n";
         echo '<td><img src="' .$GLOBALS['pmaThemeImage'] . 'spacer.png'  . '" width="1" height="1" border="0" /></td>'; 
 ?>
        <td nowrap="nowrap">
-            [<a href="ChangeLog" target="_blank">ChangeLog</a>]
+            [<a href="changelog.php" target="_blank">ChangeLog</a>]
             &nbsp;&nbsp;&nbsp;[<a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpmyadmin/phpMyAdmin/" target="_blank">CVS</a>]
             &nbsp;&nbsp;&nbsp;[<a href="http://sourceforge.net/mail/?group_id=23067" target="_blank">Lists</a>]
        </td>