diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index 0c723a02a9..bb47fde19d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -40,7 +40,7 @@
 
         <parameter key="security.http_utils.class">Symfony\Component\Security\Http\HttpUtils</parameter>
 
-        <parameter key="security.validator.user_password.class">Symfony\Bundle\SecurityBundle\Validator\Constraint\UserPasswordValidator</parameter>
+        <parameter key="security.validator.user_password.class">Symfony\Component\Security\Core\Validator\Constraint\UserPasswordValidator</parameter>
     </parameters>
 
     <services>
diff --git a/src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPassword.php b/src/Symfony/Component/Security/Core/Validator/Constraint/UserPassword.php
similarity index 89%
rename from src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPassword.php
rename to src/Symfony/Component/Security/Core/Validator/Constraint/UserPassword.php
index 141e683644..ef6e1ece30 100644
--- a/src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPassword.php
+++ b/src/Symfony/Component/Security/Core/Validator/Constraint/UserPassword.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Validator\Constraint;
+namespace Symfony\Component\Security\Core\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraint/UserPasswordValidator.php
similarity index 95%
rename from src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPasswordValidator.php
rename to src/Symfony/Component/Security/Core/Validator/Constraint/UserPasswordValidator.php
index a20d65dde2..a54906bb74 100644
--- a/src/Symfony/Bundle/SecurityBundle/Validator/Constraint/UserPasswordValidator.php
+++ b/src/Symfony/Component/Security/Core/Validator/Constraint/UserPasswordValidator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\SecurityBundle\Validator\Constraint;
+namespace Symfony\Component\Security\Core\Validator\Constraint;
 
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\SecurityContextInterface;
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
index 20308a0f00..17b3e155d2 100644
--- a/src/Symfony/Component/Security/composer.json
+++ b/src/Symfony/Component/Security/composer.json
@@ -24,6 +24,7 @@
     "require-dev": {
         "symfony/form": "2.1.*",
         "symfony/routing": "2.1.*",
+        "symfony/validator": "2.1.*",
         "doctrine/common": ">=2.2,<2.4-dev",
         "doctrine/dbal": ">=2.2,<2.4-dev"
     },
@@ -31,6 +32,7 @@
         "symfony/class-loader": "self.version",
         "symfony/finder": "self.version",
         "symfony/form": "self.version",
+        "symfony/validator": "self.version",
         "symfony/routing": "self.version",
         "doctrine/dbal": "to use the built-in ACL implementation"
     },