diff --git a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
index 62efcd7bf4..6b6cb817ae 100644
--- a/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
+++ b/core/src/main/java/org/springframework/security/config/HttpSecurityConfigPostProcessor.java
@@ -26,8 +26,8 @@ import org.springframework.security.ui.AbstractProcessingFilter;
 import org.springframework.security.ui.AuthenticationEntryPoint;
 import org.springframework.security.ui.basicauth.BasicProcessingFilter;
 import org.springframework.security.ui.rememberme.RememberMeServices;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.util.FilterChainProxy;
-import org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper;
 import org.springframework.util.Assert;
 
 /**
diff --git a/core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java b/core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
index eba9b580f3..fe261608f8 100644
--- a/core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
+++ b/core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
@@ -3,8 +3,8 @@ package org.springframework.security.config;
 import org.springframework.security.ui.preauth.PreAuthenticatedProcessingFilterEntryPoint;
 import org.springframework.security.ui.preauth.x509.X509PreAuthenticatedProcessingFilter;
 import org.springframework.security.ui.preauth.x509.SubjectDnX509PrincipalExtractor;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider;
-import org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
index 99be58443c..d24125f222 100644
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProvider.java
@@ -4,6 +4,7 @@ import org.springframework.security.providers.AuthenticationProvider;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationException;
 import org.springframework.security.BadCredentialsException;
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsChecker;
 import org.springframework.security.userdetails.checker.AccountStatusUserDetailsChecker;
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
index bcbe08116e..537eac2674 100755
--- a/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/providers/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
@@ -1,5 +1,6 @@
 package org.springframework.security.providers.preauth;
 
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.GrantedAuthoritiesContainer;
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/AuthenticationUserDetailsService.java b/core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java
similarity index 74%
rename from core/src/main/java/org/springframework/security/providers/preauth/AuthenticationUserDetailsService.java
rename to core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java
index 3d57522695..b33e5e8674 100644
--- a/core/src/main/java/org/springframework/security/providers/preauth/AuthenticationUserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/userdetails/AuthenticationUserDetailsService.java
@@ -1,7 +1,5 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.userdetails;
 
-import org.springframework.security.userdetails.UsernameNotFoundException;
-import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.Authentication;
 
 
diff --git a/core/src/main/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapper.java b/core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java
similarity index 83%
rename from core/src/main/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapper.java
rename to core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java
index cdefb96b38..0e3187231d 100755
--- a/core/src/main/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapper.java
+++ b/core/src/main/java/org/springframework/security/userdetails/UserDetailsByNameServiceWrapper.java
@@ -1,8 +1,5 @@
-package org.springframework.security.providers.preauth;
+package org.springframework.security.userdetails;
 
-import org.springframework.security.userdetails.UserDetails;
-import org.springframework.security.userdetails.UserDetailsService;
-import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.Authentication;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
diff --git a/core/src/test/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProviderTests.java
index 964dd0c348..d199edfd09 100755
--- a/core/src/test/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/providers/preauth/PreAuthenticatedAuthenticationProviderTests.java
@@ -1,6 +1,7 @@
 package org.springframework.security.providers.preauth;
 
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.userdetails.AuthenticationUserDetailsService;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UsernameNotFoundException;
diff --git a/core/src/test/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapperTests.java b/core/src/test/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapperTests.java
index c0559f76c6..c009440b10 100755
--- a/core/src/test/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/providers/preauth/UserDetailsByNameServiceWrapperTests.java
@@ -1,6 +1,7 @@
 package org.springframework.security.providers.preauth;
 
 import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.userdetails.UsernameNotFoundException;
 import org.springframework.security.userdetails.UserDetailsService;
 import org.springframework.security.userdetails.User;
diff --git a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
index eca0ef7525..4394b99c2e 100644
--- a/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
+++ b/samples/portlet/src/main/resources/portlet/securityContextPortlet.xml
@@ -72,7 +72,7 @@
     <bean id="portletAuthProvider" class="org.springframework.security.providers.preauth.PreAuthenticatedAuthenticationProvider">
         <sec:custom-authentication-provider/>
         <property name="preAuthenticatedUserDetailsService">
-            <bean class="org.springframework.security.providers.preauth.UserDetailsByNameServiceWrapper">
+            <bean class="org.springframework.security.userdetails.UserDetailsByNameServiceWrapper">
                 <property name="userDetailsService" ref="userDetailsService"/>
             </bean>
         </property>