diff --git a/ChangeLog b/ChangeLog
index 0c5b64450..c6b7bbef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2649087 None default is different than other None in some languages.
 + [lang] Chinese Simplified update, thanks to Shanyan Baishui - rimyxp 
 - patch #2550286 [display] Sort arrows problem, thanks to Virsacer - virsacer
+- [security] warn about existence of config directory on main page
 
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index fdb12a5d4..ec09a7f4c 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1477,4 +1477,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 1f2e02f7d..12b1cb82d 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1476,4 +1476,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index d76ac5616..d685175d7 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1478,4 +1478,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index e4977fa5b..f73545bac 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1473,4 +1473,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php
index 48c5a9e58..4e6944cab 100644
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1452,4 +1452,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 4ca6da7ce..c5d3bdb18 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1470,4 +1470,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index ba2fb5496..fd0ae7c07 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1452,4 +1452,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index 9820d6d38..ebbfbeda2 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1460,4 +1460,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index e1499711f..ba9fb1ca1 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1476,4 +1476,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 0d7802092..ae6b45141 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1450,4 +1450,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 7a1b2011c..60a8a2db3 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1473,4 +1473,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index 5e1996137..ce2714274 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1450,4 +1450,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index afef65671..6e7b69c0e 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1459,4 +1459,5 @@ $strYes = '是';
 $strZeroRemovesTheLimit = '注意：若将这些选项设为 0(零) 即不限制。';
 $strZip = 'zip 压缩';
 
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index d459435c8..4ab070726 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1457,4 +1457,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 3b1481cac..f3df8569c 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1454,4 +1454,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index ee1a906d3..48efeef1c 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -1458,4 +1458,5 @@ $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strShowKeys = 'Only show keys';  //to translate
 $strStatic = 'static';  //to translate
 
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index a67fa809e..4a11e3bc5 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1452,4 +1452,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 101c4ba73..65a866b3f 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1459,4 +1459,5 @@ $strSetupServers_AllowNoPassword_name = 'Inloggen zonder wachtwoord toestaan';
 $strHostTableExplanation = 'Indien er gebruik wordt gemaakt van de Host tabel is dit veld niet van toepassing.';
 $strGetMoreThemes = 'Bekijk meer thema\'s!';
 $strNoneDefault = 'Geen';
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 35e399d82..24e7f382c 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -144,6 +144,7 @@ $strCompleteInserts = 'Complete inserts';
 $strCompression = 'Compression';
 $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s';
 $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"';
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';
 $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!<br />This might happen if PHP finds a parse error in it or PHP cannot find the file.<br />Please call the configuration file directly using the link below and read the PHP error message(s) that you receive. In most cases a quote or a semicolon is missing somewhere.<br />If you receive a blank page, everything is fine.';
 $strConfigureTableCoord = 'Please configure the coordinates for table %s';
 $strConnectionError = 'Cannot connect: invalid settings.';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index 7f9964dc4..05299f82a 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1458,4 +1458,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index ae75d4832..82420902e 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1453,4 +1453,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 223ffe772..dc2dc4fb7 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1449,4 +1449,5 @@ $strZip = '"zippé"';
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 90bf29f11..e00e58603 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1451,4 +1451,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index fe83fd179..76927ad97 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1457,4 +1457,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index cdec9b393..d3f802de6 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1471,4 +1471,5 @@ $strTexyText = 'Texy! text';  //to translate
 
 $strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.';  //to translate
 
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index c8b384a58..002dcee4f 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1475,4 +1475,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index 29b73d4b5..d67a13618 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1470,4 +1470,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 38118c2b7..e8c5a7f88 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1478,4 +1478,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index b041eb9d3..f5c3e523e 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1455,4 +1455,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index 8ba1e6a9b..8fa607700 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1468,4 +1468,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 08bbe8a6c..3c0df09c2 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1457,4 +1457,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index 9def62109..70a9c1d50 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1458,4 +1458,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index fbc1f63a8..6f7764040 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1473,4 +1473,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 33d5b09aa..3119f0ab4 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1475,4 +1475,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 436368382..42b7031ac 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1467,4 +1467,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php
index c8d5b2eed..418f25be8 100644
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1453,4 +1453,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 482aa00ca..754ffd0ef 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1490,4 +1490,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index dce67d9bd..eebb59859 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1473,4 +1473,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index e91605783..2503b3988 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1450,4 +1450,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 48e348be7..8e968b7d9 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1504,4 +1504,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 0304cc38e..b3cba5463 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1446,4 +1446,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 32d560f5e..be1155592 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1479,4 +1479,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 86b24a3cd..31ca2d1ec 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1459,4 +1459,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index abcd01b23..c4079c2ac 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1463,4 +1463,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 62b7a990c..0e3d49c38 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1452,4 +1452,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index 28604ac16..3ea13b5fb 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1452,4 +1452,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php
index 14a9eb44f..ff0cb6ca6 100644
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1455,4 +1455,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index 948c78dc7..2b048ba35 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1453,4 +1453,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index 5445717c3..0a84d9433 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1472,4 +1472,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 07b86511c..3ced7737b 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1448,4 +1448,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index d3eb0da42..b39de792e 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1450,4 +1450,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index 0111bd8d2..bc7521b69 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1463,4 +1463,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index eec2dfdcb..a3a000448 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1474,4 +1474,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 0520b2340..e4b4ccfc0 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1456,4 +1456,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index ddca028c9..4c338c281 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1472,4 +1472,5 @@ $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
 $strNoneDefault = 'None';  //to translate
+$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.';  //to translate
 ?>
diff --git a/main.php b/main.php
index b1e3172d0..9f03810f2 100644
--- a/main.php
+++ b/main.php
@@ -302,6 +302,14 @@ if (!empty($_SESSION['auto_blowfish_secret']) &&
     trigger_error($strSecretRequired, E_USER_WARNING);
 }
 
+/**
+ * Check for existence of config directory which should not exist in
+ * production environment.
+ */
+if (file_exists('./config')) {
+    trigger_error($strConfigDirectoryWarning, E_USER_WARNING);
+}
+
 /**
  * Check whether relations are supported.
  */