diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index c73b5b75..1e440e4f 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -16,6 +16,7 @@ changes since the 2.3.5 release (postfixadmin-2.3 branch)
   - display domain and mailbox description with correct encoding
   - fix footer link
   - focus username input field in login form
+  - fix double inclusion of config.inc.php in setup.php
 
 Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------
diff --git a/setup.php b/setup.php
index dabda2ee..f4a45626 100644
--- a/setup.php
+++ b/setup.php
@@ -123,7 +123,6 @@ if ($file_config == 1)
     require_once($incpath.'/config.inc.php');
     $config_loaded = 1;
 
-    require($incpath.'/config.inc.php');
     if(isset($CONF['configured'])) {
         if($CONF['configured'] === TRUE) {
             print "<li>Checking \$CONF['configured'] - OK\n";