diff --git a/ChangeLog b/ChangeLog
index 37a38eef6..884a8ccfa 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-06-27 Michal Čihař  <michal@cihar.com>
+    * config.inc.php: Better comments describing multi server setup (patch
+      #1226666).
+
 2005-06-24 Michal Čihař  <michal@cihar.com>
     * tbl_change.php, tbl_properties_links.php, libraries/export/sql.php:
       Remove error reporting.
diff --git a/config.inc.php b/config.inc.php
index 0df061550..a7d662afd 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -124,6 +124,11 @@ $cfg['Servers'][$i]['AllowDeny']['order']           // Host authentication order
 $cfg['Servers'][$i]['AllowDeny']['rules']           // Host authentication rules, leave blank for defaults
                                      = array();
 
+/**
+ * If you are configuring for only one server, stop here. You can jump to the next
+ *   section called "Other core phpMyAdmin settings."
+ * The following section allows you to add a second server to this installation.
+ */
 
 $i++;
 $cfg['Servers'][$i]['host']            = '';
@@ -154,6 +159,10 @@ $cfg['Servers'][$i]['AllowDeny']['order']
 $cfg['Servers'][$i]['AllowDeny']['rules']
                                        = array();
 
+/**
+ * This section allows you to configure a third server for this installation.
+ */
+
 $i++;
 $cfg['Servers'][$i]['host']            = '';
 $cfg['Servers'][$i]['port']            = '';