diff --git a/config/alfresco/opencmis-context.xml b/config/alfresco/opencmis-context.xml
index c787f43719..e2cf05c7c2 100644
--- a/config/alfresco/opencmis-context.xml
+++ b/config/alfresco/opencmis-context.xml
@@ -190,32 +190,61 @@
         <property name="bulkWorkerThreads"      value="${opencmis.bulkUpdateProperties.workerThreads}" />
     </bean>
 
-    <bean id="OpenCMISQueryService" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
-      <property name="sourceApplicationContextFactory">
-         <ref bean="Search" />
-      </property>
-      <property name="sourceBeanName">
-         <value>search.OpenCMISQueryService</value>
-      </property>
-      <property name="interfaces">
-         <list>
+
+    <bean id="OpenCMISQueryService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
             <value>org.alfresco.opencmis.search.CMISQueryService</value>
-         </list>
-      </property>
+        </property>
+        <property name="target">
+            <ref bean="subOpenCMISQueryService" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="AuditMethodInterceptor" />
+            </list>
+        </property>
     </bean>
 
-    <bean id="OpenCMISQueryService1.1" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
-      <property name="sourceApplicationContextFactory">
-         <ref bean="Search" />
-      </property>
-      <property name="sourceBeanName">
-         <value>search.OpenCMISQueryService1.1</value>
-      </property>
-      <property name="interfaces">
-         <list>
+    <bean id="subOpenCMISQueryService" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
+        <property name="sourceApplicationContextFactory">
+            <ref bean="Search" />
+        </property>
+        <property name="sourceBeanName">
+            <value>search.OpenCMISQueryService</value>
+        </property>
+        <property name="interfaces">
+            <list>
+                <value>org.alfresco.opencmis.search.CMISQueryService</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="OpenCMISQueryService1.1" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
             <value>org.alfresco.opencmis.search.CMISQueryService</value>
-         </list>
-      </property>
+        </property>
+        <property name="target">
+            <ref bean="subOpenCMISQueryService1.1" />
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref bean="AuditMethodInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="subOpenCMISQueryService1.1" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
+        <property name="sourceApplicationContextFactory">
+            <ref bean="Search" />
+        </property>
+        <property name="sourceBeanName">
+            <value>search.OpenCMISQueryService1.1</value>
+        </property>
+        <property name="interfaces">
+            <list>
+                <value>org.alfresco.opencmis.search.CMISQueryService</value>
+            </list>
+        </property>
     </bean>
         
     <bean id="CMISChangeLogDataExtractor" class="org.alfresco.opencmis.CMISChangeLogDataExtractor">
diff --git a/source/java/org/alfresco/opencmis/search/CMISQueryService.java b/source/java/org/alfresco/opencmis/search/CMISQueryService.java
index 08f96842ae..813dfdc6fe 100644
--- a/source/java/org/alfresco/opencmis/search/CMISQueryService.java
+++ b/source/java/org/alfresco/opencmis/search/CMISQueryService.java
@@ -23,23 +23,26 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.opencmis.search;
-
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
-
-public interface CMISQueryService
-{
-    CMISResultSet query(CMISQueryOptions options);
-
-    CMISResultSet query(String query, StoreRef storeRef);
-
-    boolean getPwcSearchable();
-
-    boolean getAllVersionsSearchable();
-
-    CapabilityQuery getQuerySupport();
-
-    CapabilityJoin getJoinSupport();
+package org.alfresco.opencmis.search;
+
+import org.alfresco.service.Auditable;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
+import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
+
+public interface CMISQueryService
+{
+    @Auditable(parameters = {"options"})
+    CMISResultSet query(CMISQueryOptions options);
+
+    @Auditable(parameters = {"query", "storeRef"})
+    CMISResultSet query(String query, StoreRef storeRef);
+
+    boolean getPwcSearchable();
+
+    boolean getAllVersionsSearchable();
+
+    CapabilityQuery getQuerySupport();
+
+    CapabilityJoin getJoinSupport();
 }
\ No newline at end of file