diff --git a/config/alfresco/avm-clt-context.xml b/config/alfresco/avm-clt-context.xml
index 130b1bf2b9..5cc4a177c7 100644
--- a/config/alfresco/avm-clt-context.xml
+++ b/config/alfresco/avm-clt-context.xml
@@ -26,4 +26,16 @@
             <value>true</value>
         </property>
     </bean>    
+    
+    <bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
+        <property name="serviceUrl">
+            <value>rmi://localhost:1313/authentication</value>
+        </property>
+        <property name="serviceInterface">
+            <value>org.alfresco.service.cmr.security.AuthenticationService</value>
+        </property>
+        <property name="refreshStubOnConnectFailure">
+            <value>true</value>
+        </property>
+    </bean>
 </beans>
diff --git a/config/alfresco/extension/rmi-services-context.xml b/config/alfresco/extension/rmi-services-context.xml
new file mode 100644
index 0000000000..6c3d121630
--- /dev/null
+++ b/config/alfresco/extension/rmi-services-context.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+    <!-- The AuthenticationService exported as an RMI service. -->
+	<bean id="rmiAuthenticationService" class="org.springframework.remoting.rmi.RmiServiceExporter">
+		<property name="service">
+			<ref bean="AuthenticationService"/>
+		</property>
+		<property name="serviceInterface">
+			<value>org.alfresco.service.cmr.security.AuthenticationService</value>
+		</property>
+		<property name="serviceName">
+			<value>authentication</value>
+		</property>
+		<property name="registryPort">
+			<value>${avm.remote.port}</value>
+		</property>
+	</bean>
+</beans>
+
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java b/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java
index 4beb4f030d..3a0577af48 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java
+++ b/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java
@@ -10,6 +10,7 @@ import java.util.Map;
 
 import org.alfresco.repo.avm.AVMRemote;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -34,6 +35,11 @@ public abstract class AVMCltBase
      */
     protected ConfigurableApplicationContext fContext;
     
+    /**
+     * The Authentication Service.
+     */
+    protected AuthenticationService fAuthenticationService;
+    
     /**
      * Construct a new one. This takes care of instantiating
      * the application context and grabs references to the
@@ -45,6 +51,7 @@ public abstract class AVMCltBase
         fContext = new ClassPathXmlApplicationContext("alfresco/avm-clt-context.xml");
         fAVMRemote = (AVMRemote)fContext.getBean("avmRemote");
         fAVMSyncService = (AVMSyncService)fContext.getBean("avmSyncService");
+        fAuthenticationService = (AuthenticationService)fContext.getBean("authenticationService");
     }
     
     /**