diff --git a/ChangeLog b/ChangeLog
index 6f1473a92..b440343d9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-17 Michal Čihař  <michal@cihar.com>
+    * scripts/setup.php: Allow empty socket (bug #1452142).
+
 2006-03-16 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php: undefined variable when a BLOB is NULL
     * libraries/Theme_Manager.class.php: XSS vulnerability
diff --git a/scripts/setup.php b/scripts/setup.php
index e57947ec8..059a87c95 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -1224,10 +1224,6 @@ switch ($action) {
                 message('error', 'Empty hostname!');
                 $err = TRUE;
             }
-            if ($new_server['connect_type'] == 'socket' && empty($new_server['socket'])) {
-                message('error', 'Empty socket with socket connection seleted!');
-                $err = TRUE;
-            }
             if ($new_server['auth_type'] == 'config' && empty($new_server['user'])) {
                 message('error', 'Empty username while using config authentication method!');
                 $err = TRUE;