diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index 775a8f637d..bbd26660ca 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -1006,7 +1006,7 @@
 
     <!-- The AVMService -->
     
-    <bean id="AVMService" class="org.alfresco.repo.avm.AVMServiceImpl">
+    <bean id="avmService" class="org.alfresco.repo.avm.AVMServiceImpl">
 	    <property name="retryingTransaction">
 	    	<ref bean="retryingTransaction"/>
 	    </property>
@@ -1014,6 +1014,29 @@
 	    	<ref bean="avmRepository"/>
 	    </property>
 	</bean>
+	
+	<bean id="AVMService" class="org.springframework.aop.framework.ProxyFactoryBean">
+		<property name="proxyInterfaces">
+			<value>org.alfresco.service.cmr.avm.AVMService</value>
+		</property>
+		<property name="target">
+			<ref bean="avmService"/>
+		</property>
+		<property name="interceptorNames">
+			<list>
+				<idref local="AVMService_descriptor"/>
+			</list>
+		</property>
+	</bean>
+
+    <bean id="AVMService_descriptor" parent="AlfrescoServiceDescriptor">
+        <property name="interface">
+            <value>org.alfresco.service.cmr.avm.AVMService</value>
+        </property>
+        <property name="description">
+            <value>AVM Service</value>
+        </property>
+    </bean>
     
     <!-- Workflow Service -->
     
diff --git a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
index eb018bc77a..65325eb4eb 100644
--- a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
+++ b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.alfresco.service.ServiceDescriptor;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.lock.LockService;
@@ -322,4 +323,13 @@ public class ServiceDescriptorRegistry
     {
         return (WorkflowService)getService(WORKFLOW_SERVICE);
     }
+    
+    /**
+     * Get the AVMService.
+     * @return The AVMService or null if there is none.
+     */
+    public AVMService getAVMService()
+    {
+        return (AVMService)getService(AVM_SERVICE);
+    }
 }
diff --git a/source/java/org/alfresco/service/ServiceRegistry.java b/source/java/org/alfresco/service/ServiceRegistry.java
index 7e893e3789..9be742d026 100644
--- a/source/java/org/alfresco/service/ServiceRegistry.java
+++ b/source/java/org/alfresco/service/ServiceRegistry.java
@@ -19,6 +19,7 @@ package org.alfresco.service;
 import java.util.Collection;
 
 import org.alfresco.service.cmr.action.ActionService;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.lock.LockService;
@@ -84,6 +85,7 @@ public interface ServiceRegistry
     static final QName FILE_FOLDER_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FileFolderService");
     static final QName SCRIPT_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ScriptService");
     static final QName WORKFLOW_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "WorkflowService");
+    static final QName AVM_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AVMService");
     
     /**
      * Get the list of services provided by the Repository
@@ -263,4 +265,11 @@ public interface ServiceRegistry
      */
     @NotAuditable
     WorkflowService getWorkflowService();
+    
+    /**
+     * Get the AVMService.
+     * @return The AVM service (or null if one is not provided);
+     */
+    @NotAuditable
+    AVMService getAVMService();
 }