diff --git a/config/alfresco/cmis-api-context.xml b/config/alfresco/cmis-api-context.xml
index 5cc5e56633..be412bf99d 100644
--- a/config/alfresco/cmis-api-context.xml
+++ b/config/alfresco/cmis-api-context.xml
@@ -10,7 +10,7 @@
     </bean>
 
     <bean id="CMISService" class="org.alfresco.cmis.mapping.CMISServicesImpl">
-        <property name="CMISSpecVersion"><value>0.6</value></property>
+        <property name="CMISSpecVersion"><value>0.61</value></property>
         <property name="defaultRootPath"><value>workspace/SpacesStore/Company Home</value></property>
         <property name="dictionaryService" ref="dictionaryService" />
         <property name="CMISDictionaryService" ref="CMISDictionaryService" />
diff --git a/source/java/org/alfresco/cmis/CMISJoinEnum.java b/source/java/org/alfresco/cmis/CMISJoinEnum.java
index b15cb92716..077bd08ac1 100644
--- a/source/java/org/alfresco/cmis/CMISJoinEnum.java
+++ b/source/java/org/alfresco/cmis/CMISJoinEnum.java
@@ -31,7 +31,7 @@ package org.alfresco.cmis;
  */
 public enum CMISJoinEnum implements EnumLabel
 {
-    NO_JOIN_SUPPORT("nojoin"),
+    NO_JOIN_SUPPORT("none"),
     INNER_JOIN_SUPPORT("inneronly"),
     INNER_AND_OUTER_JOIN_SUPPORT("innerandouter");