diff --git a/ChangeLog b/ChangeLog
index ac755a64d..31cff2de6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 
+2006-07-13 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php: put emphasis on server name
+
 2006-07-12 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: patch #1519351, security alerts,
       thanks to Juergen Wind - windkiel
diff --git a/main.php b/main.php
index bb587f8d5..121fe4052 100644
--- a/main.php
+++ b/main.php
@@ -74,16 +74,22 @@ if ($server > 0) {
     // }
     $mysql_cur_user_and_host = PMA_DBI_fetch_value('SELECT USER();');
 
-    echo '<h1 xml:lang="en" dir="ltr">MySQL - ' . PMA_MYSQL_STR_VERSION
-        .'</h1>' . "\n";
+
+    // should we add the port info here?
+    $short_server_info = (!empty($GLOBALS['cfg']['Server']['verbose'])
+                        ? $GLOBALS['cfg']['Server']['verbose']
+                        : $GLOBALS['cfg']['Server']['host']);
+    echo '<h1 xml:lang="en" dir="ltr">' . $short_server_info .'</h1>' . "\n";
+    unset($short_server_info);
 } else {
     // Case when no server selected
-    echo '<h1 xml:lang="en" dir="ltr">MySQL</h1>' . "\n";
+    //echo '<h1 xml:lang="en" dir="ltr">MySQL</h1>' . "\n";
 }
 
 if ($server > 0) {
     echo '<ul>' . "\n";
 
+    PMA_printListItem($strServerVersion . ': ' . PMA_MYSQL_STR_VERSION, 'li_server_info');
     PMA_printListItem($strProtocolVersion . ': ' . PMA_DBI_get_proto_info(),
         'li_mysql_proto');
     PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info');