diff --git a/source/java/org/alfresco/repo/search/DocumentNavigator.java b/source/java/org/alfresco/repo/search/DocumentNavigator.java
index ff04d0088e..e0ccf66f05 100644
--- a/source/java/org/alfresco/repo/search/DocumentNavigator.java
+++ b/source/java/org/alfresco/repo/search/DocumentNavigator.java
@@ -36,6 +36,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.ISO9075;
 import org.jaxen.DefaultNavigator;
 import org.jaxen.JaxenException;
 import org.jaxen.UnsupportedAxisException;
diff --git a/source/java/org/alfresco/repo/search/NodeServiceXPath.java b/source/java/org/alfresco/repo/search/NodeServiceXPath.java
index 5540ad49a2..b78a65fd82 100644
--- a/source/java/org/alfresco/repo/search/NodeServiceXPath.java
+++ b/source/java/org/alfresco/repo/search/NodeServiceXPath.java
@@ -31,6 +31,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.util.ISO9075;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jaxen.BaseXPath;
diff --git a/source/java/org/alfresco/repo/search/SearcherComponentTest.java b/source/java/org/alfresco/repo/search/SearcherComponentTest.java
index 1986893c8f..3930d8db9a 100644
--- a/source/java/org/alfresco/repo/search/SearcherComponentTest.java
+++ b/source/java/org/alfresco/repo/search/SearcherComponentTest.java
@@ -41,6 +41,7 @@ import org.alfresco.service.namespace.DynamicNamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.ISO9075;
 import org.springframework.context.ApplicationContext;
 
 /**
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
index 9a4282537d..a3c7e394fd 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
@@ -27,7 +27,6 @@ import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.IndexerException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -40,6 +39,7 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
 
 public class LuceneCategoryServiceImpl implements CategoryService
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
index e0110da164..0fb93e1561 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java
@@ -38,7 +38,6 @@ import javax.transaction.xa.XAResource;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.IndexerException;
 import org.alfresco.repo.search.impl.lucene.fts.FTSIndexerAware;
 import org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexer;
@@ -63,6 +62,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.ISO9075;
 import org.apache.log4j.Logger;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcherImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcherImpl.java
index 8191629b4c..ecf346b712 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcherImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcherImpl.java
@@ -28,7 +28,6 @@ import java.util.Set;
 
 import org.alfresco.repo.search.CannedQueryDef;
 import org.alfresco.repo.search.EmptyResultSet;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.Indexer;
 import org.alfresco.repo.search.QueryRegisterComponent;
 import org.alfresco.repo.search.SearcherException;
@@ -48,6 +47,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 import org.alfresco.util.SearchLanguageConversion;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.Query;
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
index cc6338afd1..1f2eb458b5 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java
@@ -39,7 +39,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.dictionary.DictionaryDAO;
 import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.node.BaseNodeServiceTest;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.QueryParameterDefImpl;
 import org.alfresco.repo.search.QueryRegisterComponent;
 import org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexer;
@@ -72,6 +71,7 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.CachingDateFormat;
+import org.alfresco.util.ISO9075;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
diff --git a/source/java/org/alfresco/service/cmr/repository/Path.java b/source/java/org/alfresco/service/cmr/repository/Path.java
index dd03bf18f7..8954bb2719 100644
--- a/source/java/org/alfresco/service/cmr/repository/Path.java
+++ b/source/java/org/alfresco/service/cmr/repository/Path.java
@@ -21,10 +21,10 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 
 /**
  * Representation of a simple path e.g.
diff --git a/source/java/org/alfresco/repo/search/ISO9075.java b/source/java/org/alfresco/util/ISO9075.java
similarity index 96%
rename from source/java/org/alfresco/repo/search/ISO9075.java
rename to source/java/org/alfresco/util/ISO9075.java
index fe1e8b8752..e8f661a162 100644
--- a/source/java/org/alfresco/repo/search/ISO9075.java
+++ b/source/java/org/alfresco/util/ISO9075.java
@@ -14,7 +14,7 @@
  * language governing permissions and limitations under the
  * License.
  */
-package org.alfresco.repo.search;
+package org.alfresco.util;
 
 import java.util.Collection;
 
diff --git a/source/java/org/alfresco/repo/search/ISO9075Test.java b/source/java/org/alfresco/util/ISO9075Test.java
similarity index 97%
rename from source/java/org/alfresco/repo/search/ISO9075Test.java
rename to source/java/org/alfresco/util/ISO9075Test.java
index cbc4480abe..b1d6624369 100644
--- a/source/java/org/alfresco/repo/search/ISO9075Test.java
+++ b/source/java/org/alfresco/util/ISO9075Test.java
@@ -14,7 +14,7 @@
  * language governing permissions and limitations under the
  * License.
  */
-package org.alfresco.repo.search;
+package org.alfresco.util;
 
 import junit.framework.TestCase;