diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 742df1c854..c81accee3c 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -29,6 +29,7 @@
     <import resource="classpath:alfresco/avm-services-context.xml" />
     <import resource="classpath:alfresco/audit-services-context.xml" />
     <import resource="classpath:alfresco/attributes-service-context.xml"/>
+    <import resource="classpath:alfresco/remote-services-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
 
diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 984c7c59a8..77d732f5d6 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -363,21 +363,4 @@
             <value>false</value>
         </property>
     </bean>
-    
-    <!-- Here for now. Probably want remote-context.xml file. -->
-    <!-- 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>
\ No newline at end of file
diff --git a/config/alfresco/avm-services-context.xml b/config/alfresco/avm-services-context.xml
index 8f88502260..35410e747f 100644
--- a/config/alfresco/avm-services-context.xml
+++ b/config/alfresco/avm-services-context.xml
@@ -211,62 +211,6 @@
 	    </property>
 	</bean>
 
-	<!-- The remote interface implementation. -->
-	
-	<bean id="avmRemoteTransport" class="org.alfresco.repo.avm.AVMRemoteTransportService"
-		init-method="init" destroy-method="shutDown">
-		<property name="idleTimeout">
-			<value>${avm.remote.idlestream.timeout}</value>
-		</property>
-		<property name="avmService">
-			<ref bean="AVMService"/>
-		</property>
-		<property name="authenticationService">
-		    <ref bean="AuthenticationService"/>
-		</property>
-	</bean>
-	
-	<!-- The RMI wrapper around the AVM remote interface. -->
-	
-	<bean id="avmRemoteService" class="org.springframework.remoting.rmi.RmiServiceExporter">
-		<property name="service">
-			<ref bean="avmRemoteTransport"/>
-		</property>
-		<property name="serviceInterface">
-			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
-		</property>
-		<property name="serviceName">
-			<value>avm</value>
-		</property>
-		<property name="registryPort">
-			<value>${avm.remote.port}</value>
-		</property>
-	</bean>
-			
-    <bean id="avmSyncServiceTransport" class="org.alfresco.repo.avm.AVMSyncServiceTransportImpl">
-        <property name="authenticationService">
-            <ref bean="AuthenticationService"/>
-        </property>
-        <property name="avmSyncService">
-            <ref bean="AVMSyncService"/>
-        </property>
-    </bean>
-			
-    <bean id="avmSyncServiceTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter">
-        <property name="service">
-            <ref bean="avmSyncServiceTransport"/>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
-        </property>
-        <property name="serviceName">
-            <value>avmsync</value>
-        </property>
-        <property name="registryPort">
-            <value>${avm.remote.port}</value>
-        </property>
-    </bean>
-
     <bean id="AVMSubmittedAspect" class="org.alfresco.repo.avm.wf.AVMSubmittedAspect">
         <property name="avmService">
             <ref bean="AVMService"/>
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 7e48b67fc2..8aa88f2ad5 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -802,72 +802,4 @@
             <value>/sys:system-registry</value>
         </property>
     </bean>
-
-    <!-- A Simple Filesystem like API for the repo implementation.
-	     Unfinished, experimental, and probably ephemeral. -->
-    <bean id="repoRemoteService" class="org.alfresco.repo.remote.RepoRemoteService">
-        <property name="nodeService">
-        	<ref bean="dbNodeService"/>
-        </property>
-        <property name="fileFolderService">
-            <ref bean="fileFolderService"/>
-        </property>
-        <property name="contentService">
-            <ref bean="contentService"/>
-        </property>
-    </bean>	
-
-	<!-- Transactionally wrapped version of above. -->
-    <bean id="RepoRemoteService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="proxyInterfaces">
-		    <value>org.alfresco.service.cmr.remote.RepoRemote</value>
-		</property>    
-		<property name="target">
-		    <ref bean="repoRemoteService"/>
-		</property>
-		<property name="transactionManager">
-		    <ref bean="transactionManager"/>
-		</property>
-		<property name="transactionAttributes">
-		    <props>
-		        <prop key="create*">${server.transaction.mode.default}</prop>
-		        <prop key="get*">${server.transaction.mode.readOnly}</prop>
-		        <prop key="lookup">${server.transaction.mode.readOnly}</prop>
-		        <prop key="read*">${server.transaction.mode.readOnly}</prop>
-		        <prop key="remove*">${server.transaction.mode.default}</prop>
-		        <prop key="rename">${server.transaction.mode.default}</prop>
-		        <prop key="write*">${server.transaction.mode.default}</prop>
-		    </props>
-		</property>
-	</bean>
-
-	<!-- The server side repo remote transport, to be exported via RMI, etc. -->
-    <bean id="repoRemoteTransport" class="org.alfresco.repo.remote.RepoRemoteTransportService">
-        <property name="authenticationService">
-            <ref bean="authenticationService"/>
-        </property>
-        <property name="repoRemote">
-            <ref bean="RepoRemoteService"/>
-        </property>
-        <property name="idleTimeout">
-            <value>30000</value>
-        </property>
-	</bean>
-
-	<!-- The RMI export of the repo remote transport. -->
-    <bean id="repoRemoteTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter">
-        <property name="service">
-            <ref bean="repoRemoteTransport"/>
-        </property>
-        <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.remote.RepoRemoteTransport</value>
-        </property>
-        <property name="serviceName">
-            <value>repo</value>
-        </property>
-        <property name="registryPort">
-            <value>${avm.remote.port}</value>
-        </property>
-    </bean>
-
 </beans>
diff --git a/config/alfresco/remote-services-context.xml b/config/alfresco/remote-services-context.xml
new file mode 100644
index 0000000000..78f4249e08
--- /dev/null
+++ b/config/alfresco/remote-services-context.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING/DTD BEAN//EN"
+	"http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+	<bean id="avmRemoteTransport" class="org.alfresco.repo.avm.AVMRemoteTransportService"
+		init-method="init" destroy-method="shutDown">
+		<property name="idleTimeout">
+			<value>${avm.remote.idlestream.timeout}</value>
+		</property>
+		<property name="avmService">
+			<ref bean="AVMService"/>
+		</property>
+		<property name="authenticationService">
+		    <ref bean="AuthenticationService"/>
+		</property>
+	</bean>
+	
+	<!-- The RMI wrapper around the AVM remote interface. -->
+	
+	<bean id="avmRemoteService" class="org.springframework.remoting.rmi.RmiServiceExporter">
+		<property name="service">
+			<ref bean="avmRemoteTransport"/>
+		</property>
+		<property name="serviceInterface">
+			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
+		</property>
+		<property name="serviceName">
+			<value>avm</value>
+		</property>
+		<property name="registryPort">
+			<value>${avm.remote.port}</value>
+		</property>
+	</bean>
+			
+    <bean id="avmSyncServiceTransport" class="org.alfresco.repo.avm.AVMSyncServiceTransportImpl">
+        <property name="authenticationService">
+            <ref bean="AuthenticationService"/>
+        </property>
+        <property name="avmSyncService">
+            <ref bean="AVMSyncService"/>
+        </property>
+    </bean>
+			
+    <bean id="avmSyncServiceTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter">
+        <property name="service">
+            <ref bean="avmSyncServiceTransport"/>
+        </property>
+        <property name="serviceInterface">
+            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
+        </property>
+        <property name="serviceName">
+            <value>avmsync</value>
+        </property>
+        <property name="registryPort">
+            <value>${avm.remote.port}</value>
+        </property>
+    </bean>
+    
+    <!-- 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>    
+	
+    <!-- A Simple Filesystem like API for the repo implementation.
+	     Unfinished, experimental, and probably ephemeral. -->
+    <bean id="repoRemoteService" class="org.alfresco.repo.remote.RepoRemoteService">
+        <property name="nodeService">
+        	<ref bean="dbNodeService"/>
+        </property>
+        <property name="fileFolderService">
+            <ref bean="fileFolderService"/>
+        </property>
+        <property name="contentService">
+            <ref bean="contentService"/>
+        </property>
+    </bean>	
+
+	<!-- Transactionally wrapped version of above. -->
+    <bean id="RepoRemoteService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="proxyInterfaces">
+		    <value>org.alfresco.service.cmr.remote.RepoRemote</value>
+		</property>    
+		<property name="target">
+		    <ref bean="repoRemoteService"/>
+		</property>
+		<property name="transactionManager">
+		    <ref bean="transactionManager"/>
+		</property>
+		<property name="transactionAttributes">
+		    <props>
+		        <prop key="create*">${server.transaction.mode.default}</prop>
+		        <prop key="get*">${server.transaction.mode.readOnly}</prop>
+		        <prop key="lookup">${server.transaction.mode.readOnly}</prop>
+		        <prop key="read*">${server.transaction.mode.readOnly}</prop>
+		        <prop key="remove*">${server.transaction.mode.default}</prop>
+		        <prop key="rename">${server.transaction.mode.default}</prop>
+		        <prop key="write*">${server.transaction.mode.default}</prop>
+		    </props>
+		</property>
+	</bean>
+
+	<!-- The server side repo remote transport, to be exported via RMI, etc. -->
+    <bean id="repoRemoteTransport" class="org.alfresco.repo.remote.RepoRemoteTransportService">
+        <property name="authenticationService">
+            <ref bean="authenticationService"/>
+        </property>
+        <property name="repoRemote">
+            <ref bean="RepoRemoteService"/>
+        </property>
+        <property name="idleTimeout">
+            <value>30000</value>
+        </property>
+	</bean>
+
+	<!-- The RMI export of the repo remote transport. -->
+    <bean id="repoRemoteTransportRMI" class="org.springframework.remoting.rmi.RmiServiceExporter">
+        <property name="service">
+            <ref bean="repoRemoteTransport"/>
+        </property>
+        <property name="serviceInterface">
+            <value>org.alfresco.service.cmr.remote.RepoRemoteTransport</value>
+        </property>
+        <property name="serviceName">
+            <value>repo</value>
+        </property>
+        <property name="registryPort">
+            <value>${avm.remote.port}</value>
+        </property>
+    </bean>	
+    
+    <!-- The RMI export of the AttributeService. -->
+    <bean id="attributeServiceRMI" class="org.springframework.remoting.rmi.RmiServiceExporter">
+        <property name="service">
+            <ref bean="AttributeService"/>
+        </property>
+        <property name="serviceInterface">
+            <value>org.alfresco.service.cmr.attributes.AttributeService</value>
+        </property>
+        <property name="serviceName">
+            <value>${avm.remote.port}</value>
+        </property>
+    </bean>
+</beans>
\ No newline at end of file