diff --git a/ChangeLog b/ChangeLog
index 1ffcf7ebf..e45c5e459 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-02-23 Michal Čihař  <michal@cihar.com>
+    * libraries/config.default.php, libraries/header.inc.php,
+      Documentation.html: More replacements for page title (RFE #1408241).
+
 2006-02-23 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/Config.class.php: bug #1418769 part 1: stat failed for 
       ./config.inc.php (under PHP 4)
diff --git a/Documentation.html b/Documentation.html
index 4428c8772..f1af804e4 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1645,6 +1645,10 @@ ALTER TABLE `pma_column_comments`
                 <dd>HTTP host that runs phpMyAdmin</dd>
             <dt><code>@SERVER@</code></dt>
                 <dd>MySQL server name</dd>
+            <dt><code>@VERBOSE@</code></dt>
+                <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
+            <dt><code>@VSERVER@</code></dt>
+                <dd>Verbose MySQL server name if set, otherwise normal</dd>
             <dt><code>@DATABASE@</code></dt>
                 <dd>Currently opened database</dd>
             <dt><code>@TABLE@</code></dt>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 4f5c66ab2..ed33f6691 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -516,9 +516,9 @@ $cfg['NaturalOrder']        = TRUE;         // Sort table and database in natura
 // 2004-05-08 rabus: We need to rearrange these variables.
 
 // Window title settings
-$cfg['TitleTable']          = '@HTTP_HOST@ / @SERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
-$cfg['TitleDatabase']       = '@HTTP_HOST@ / @SERVER@ / @DATABASE@ | @PHPMYADMIN@';
-$cfg['TitleServer']         = '@HTTP_HOST@ / @SERVER@ | @PHPMYADMIN@';
+$cfg['TitleTable']          = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
+$cfg['TitleDatabase']       = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@';
+$cfg['TitleServer']         = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
 $cfg['TitleDefault']        = '@HTTP_HOST@ | @PHPMYADMIN@';
 
 $cfg['ErrorIconic']          = TRUE;    // show some icons for warning, error and information messages (true|false)?
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 105ac92f0..c36077f30 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -30,6 +30,8 @@ if (empty($GLOBALS['is_header_sent'])) {
                     array(
                         '@HTTP_HOST@',
                         '@SERVER@',
+                        '@VERBOSE@',
+                        '@VSERVER@',
                         '@DATABASE@',
                         '@TABLE@',
                         '@PHPMYADMIN@',
@@ -37,6 +39,8 @@ if (empty($GLOBALS['is_header_sent'])) {
                     array(
                         isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '',
                         isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : '',
+                        isset($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : '',
+                        !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : (isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : ''),
                         isset($GLOBALS['db']) ? $GLOBALS['db'] : '',
                         isset($GLOBALS['table']) ? $GLOBALS['table'] : '',
                         'phpMyAdmin ' . PMA_VERSION,