diff --git a/ChangeLog b/ChangeLog
index 23ee4477f..682a8d6ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,7 @@ $Id$
   a page size increase, thanks to Martin Schönberger - mad05
 - bug #3054458 [core] Fixed displaying number of rows.
 - bug #3035300 [parser] Fixed wrong definition of keywords.
+- [setup] Fixed escaping of server name.
 
 3.3.6.0 (2010-08-28)
 - bug #3033063 [core] Navi gets wrong db name
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 1b1285cee..00723cdfb 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -117,7 +117,7 @@ display_form_top('index.php', 'get', array(
 <?php foreach ($cf->getServers() as $id => $server): ?>
 <tr>
     <td><?php echo $id ?></td>
-    <td><?php echo $cf->getServerName($id) ?></td>
+    <td><?php echo htmlspecialchars($cf->getServerName($id)) ?></td>
     <td><?php echo htmlspecialchars($cf->getValue("Servers/$id/auth_type")) ?></td>
     <td><?php echo htmlspecialchars($cf->getServerDSN($id)) ?></td>
     <td style="white-space: nowrap">