diff --git a/libraries/config.values.php b/libraries/config.values.php
index e65a0d5a8..e0f4101e8 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -97,8 +97,8 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
     ? 'mysqli' : 'mysql';
 
 /**
- * Validator assignments (functions from setup/validate.lib.php and 'validators'
- * object in setup/scripts.js)
+ * Validator assignments (functions from libraries/config/validate.lib.php and 'validators'
+ * object in js/config.js)
  * Use only full paths and form ids
  */
 $cfg_db['_validators'] = array(
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index c20e926ef..4e251d271 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -16,7 +16,7 @@
  * Core libraries.
  */
 require_once './libraries/config/FormDisplay.tpl.php';
-require_once './setup/lib/validate.lib.php';
+require_once './libraries/config/validate.lib.php';
 require_once './libraries/js_escape.lib.php';
 
 /**
diff --git a/setup/lib/validate.lib.php b/libraries/config/validate.lib.php
similarity index 99%
rename from setup/lib/validate.lib.php
rename to libraries/config/validate.lib.php
index 47e81d10c..ca01ec1f9 100644
--- a/setup/lib/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -11,9 +11,8 @@
  *
  * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
- * @package    phpMyAdmin-setup
+ * @package    phpMyAdmin
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id$
  */
 
 /**
diff --git a/setup/validate.php b/setup/validate.php
index 68781bc98..c4441184d 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -14,7 +14,7 @@
 require './lib/common.inc.php';
 
 $validators = array();
-require './setup/lib/validate.lib.php';
+require './libraries/config/validate.lib.php';
 
 header('Content-type: application/json');