diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index c5b4ae976a..099dec843b 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -737,15 +737,7 @@
         <property name="serviceName"        value="cmis" />
         <property name="baseUrlGenerator"   ref="baseUrlGenerator" />
         <property name="version"            value="1.0"/>
-    </bean>
-
-    <bean   id="cmisAtomPubDispatcher1" class="org.alfresco.opencmis.PublicApiAtomPubCMISDispatcher" init-method="init">
-        <property name="descriptorService"  ref="DescriptorService"/>
-        <property name="cmisServiceFactory" ref="publicApiCMISServiceFactory"/>
-        <property name="registry"           ref="cmisDispatcherRegistry" />
-        <property name="serviceName"        value="cmis" />
-        <property name="baseUrlGenerator"   ref="baseUrlGenerator" />
-        <property name="version"            value="1"/>
+        <property name="cmisVersion"        value="1.0"/>
     </bean>
 
     <bean   id="cmisAtomPubDispatcher1.1" class="org.alfresco.opencmis.PublicApiAtomPubCMISDispatcher" init-method="init">
@@ -755,6 +747,7 @@
         <property name="serviceName"        value="cmis" />
         <property name="baseUrlGenerator"   ref="baseUrlGenerator" />
         <property name="version"            value="1.1"/>
+        <property name="cmisVersion"        value="1.1"/>
     </bean>
 
     <bean   id="cmisBrowserDispatcher1.1" class="org.alfresco.opencmis.PublicApiBrowserCMISDispatcher" init-method="init">
@@ -764,6 +757,7 @@
         <property name="registry"           ref="cmisDispatcherRegistry" />
         <property name="serviceName"        value="cmis" />
         <property name="version"            value="1.1"/>
+        <property name="cmisVersion"        value="1.1"/>
     </bean>
 
     <bean   id="webscript.org.alfresco.api.opencmis.OpenCMIS.get" 
diff --git a/source/java/org/alfresco/opencmis/CMISServletDispatcher.java b/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
index f35f2c6709..9d12b5c66c 100644
--- a/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
+++ b/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
@@ -41,6 +41,7 @@ import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.alfresco.opencmis.CMISDispatcherRegistry.Endpoint;
 import org.alfresco.service.descriptor.Descriptor;
 import org.alfresco.service.descriptor.DescriptorService;
+import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
 import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
 import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
 import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
@@ -64,6 +65,7 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 	protected String serviceName;
 	protected BaseUrlGenerator baseUrlGenerator;
 	protected String version;
+	protected CmisVersion cmisVersion;
 	
 	public void setDescriptorService(DescriptorService descriptorService)
 	{
@@ -100,7 +102,12 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 		return serviceName;
 	}
 	
-	protected synchronized Descriptor getCurrentDescriptor()
+	public void setCmisVersion(String cmisVersion)
+    {
+        this.cmisVersion = CmisVersion.fromValue(cmisVersion);
+    }
+
+    protected synchronized Descriptor getCurrentDescriptor()
 	{
 		if(this.currentDescriptor == null)
 		{
@@ -205,7 +212,7 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 			}
 			else if(arg0.equals(CmisAtomPubServlet.PARAM_CMIS_VERSION))
 			{
-				return version;
+				return (cmisVersion != null ? cmisVersion.value() : CmisVersion.CMIS_1_0.value());
 			}
 			return null;
 		}