diff --git a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
index ba1cbad9..941e361e 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java
@@ -17,6 +17,7 @@ package org.springframework.ldap.core;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.support.LdapEncoder;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index 705f1d22..1920e88d 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -24,7 +24,7 @@ import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.AuthenticationSource;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
-import org.springframework.ldap.core.LdapEncoder;
+import org.springframework.ldap.support.LdapEncoder;
 import org.springframework.ldap.support.LdapUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
diff --git a/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java b/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
index ec5d0d25..4d1e8a73 100644
--- a/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/CompareFilter.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.ldap.filter;
 
-import org.springframework.ldap.core.LdapEncoder;
+import org.springframework.ldap.support.LdapEncoder;
 
 /**
  * Abstract superclass for filters that compare values.
diff --git a/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java b/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
index 01a99862..7553ee88 100644
--- a/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/LikeFilter.java
@@ -16,7 +16,7 @@
 
 package org.springframework.ldap.filter;
 
-import org.springframework.ldap.core.LdapEncoder;
+import org.springframework.ldap.support.LdapEncoder;
 
 /**
  * This filter allows the user to specify wildcards (*) by not escaping them in
diff --git a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
index 75442d5e..92fc96ac 100644
--- a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
@@ -16,7 +16,7 @@
 package org.springframework.ldap.filter;
 
 import org.springframework.util.StringUtils;
-import org.springframework.ldap.core.LdapEncoder;
+import org.springframework.ldap.support.LdapEncoder;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapEncoder.java b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
similarity index 96%
rename from core/src/main/java/org/springframework/ldap/core/LdapEncoder.java
rename to core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
index 46e74686..8720b3f7 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapEncoder.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.core;
+package org.springframework.ldap.support;
 
 import org.springframework.ldap.BadLdapGrammarException;
 
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
similarity index 93%
rename from core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
rename to core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
index f6974504..1c9f87c9 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapEncoderTest.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ldap.core;
+package org.springframework.ldap.support;
 
 import org.junit.Test;
 import org.springframework.ldap.BadLdapGrammarException;