3 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 20dd8e09ef..8e2f956eea 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $Source$
 	   - bug #1144110 Unable to escape "_"
 	   - now every user from every mysql table is displayed
 	   - no table specific rights for db wildcards
+	* index.php, favicon.ico: added favicon.ico
 
 2005-10-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php::PMA_formatNumber(), 
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000000..5d682c5ca8
--- /dev/null
+++ b/favicon.ico
diff --git a/index.php b/index.php
index 2d1a3a6b56..386030a837 100644
--- a/index.php
+++ b/index.php
@@ -128,6 +128,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     xml:lang="<?php echo $lang_iso_code; ?>"
     lang="<?php echo $lang_iso_code; ?>"
     dir="<?php echo $GLOBALS['text_dir']; ?>">
+    <link rel="shortcut icon" href="favicon.ico" type="image/ico" />
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
 <meta http-equiv="Content-Type"