diff --git a/ChangeLog b/ChangeLog
index 1121df9a9..5280c6294 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-11-29  Loïc Chapeaux  <lolo@phpheaven.net>
+	* header.inc.php3, lines 76-83: displays verbose server description
+	  rather than hostname as window title.
 2001-11-26  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_indexes.php3: fulltext indexes is available since MySQL 3.23.23
 	  only.
diff --git a/header.inc.php3 b/header.inc.php3
index e1556cec4..923fe77c8 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -69,16 +69,18 @@ A:hover.nav   {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
 </style>
 
 <?php
+$title     = '';
 if (isset($db)) {
-    $title = str_replace('\'', '\\\'', $db);
+    $title .= str_replace('\'', '\\\'', $db);
 }
 if (isset($table)) {
-    $title = (isset($title) ? $title . '.' . str_replace('\'', '\\\'', $table) : str_replace('\'', '\\\'', $table));
+    $title .= (empty($title) ? '' : '.') . str_replace('\'', '\\\'', $table);
 }
 if (!empty($cfgServer) && isset($cfgServer['host'])) {
-    $title = (isset($title) ? $title . ' ' . trim($strRunning) . ' ' . str_replace('\'', '\\\'', $cfgServer['host']) : str_replace('\'', '\\\'', $cfgServer['host']));
+    $title .= (empty($title) ? '' : ' ') . trim($strRunning) . ' '
+           .  (empty($cfgServer['verbose']) ? str_replace('\'', '\\\'', $cfgServer['host']) : str_replace('\'', '\\\'', $cfgServer['verbose']));
 }
-$title = (isset($title) ? $title . ' - phpMyAdmin ' . PMA_VERSION : 'phpMyAdmin ' . PMA_VERSION);
+$title     .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
 ?>
 <script type="text/javascript" language="javascript">
 <!--