diff --git a/config/alfresco/model/permissionDefinitions.xml b/config/alfresco/model/permissionDefinitions.xml
index e09bd7a287..701d8eea23 100644
--- a/config/alfresco/model/permissionDefinitions.xml
+++ b/config/alfresco/model/permissionDefinitions.xml
@@ -228,38 +228,43 @@
    <!-- Permissions specific to content -->
    <!-- =============================== -->
    
-   <permissionSet type="cm:content" expose="all">
+   <permissionSet type="cm:content" expose="selected">
 
       <!-- Extend some base permission groups to include permissoins related to content. -->
-      <permissionGroup name="Read" extends="true" expose="true"/>
-      <permissionGroup name="Write" extends="true" expose="true"/>
+      <permissionGroup name="Read" extends="true" expose="false"/>
+      <permissionGroup name="Write" extends="true" expose="false"/>
       
       <!-- Add an execute permission group.                                              -->
-      <permissionGroup name="Execute" allowFullControl="false" expose="true"/>
+      <permissionGroup name="Execute" allowFullControl="false" expose="false"/>
       
       <!-- Content specific low-level permissions.                                       -->
       
       <!-- The permission to read content.                                               -->
       
-      <permission name="ReadContent" expose="true">
+      <permission name="ReadContent" expose="false">
          <grantedToGroup permissionGroup="Read"/>
          <requiredPermission on="parent" name="ReadChildren" implies="false"/>
       </permission>
 
       <!-- The permission to write content.                                              -->
       
-      <permission name="WriteContent" expose="true">
+      <permission name="WriteContent" expose="false">
          <grantedToGroup permissionGroup="Write" />
          <requiredPermission on="parent" name="ReadChildren" implies="false"/>
       </permission>
       
       <!-- Execute permission on content.                                                -->
       
-      <permission name="ExecuteContent" expose="true">
+      <permission name="ExecuteContent" expose="false">
          <grantedToGroup permissionGroup="Execute" />
          <requiredPermission on="parent" name="ReadChildren" implies="false"/>
       </permission>
       
+      <permissionGroup name="Coordinator" extends="true" expose="true"/>
+      <permissionGroup name="Contributor" extends="true" expose="true"/>
+      <permissionGroup name="Editor" extends="true" expose="true"/>
+      <permissionGroup name="Guest" extends="true" expose="true"/>
+      
    </permissionSet>
    
    <!-- ============================================== -->
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
index 52a9234913..914517fbe8 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
@@ -308,7 +308,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
         assertEquals(0, answer.size());
 
         answer = permissionService.getSettablePermissions(QName.createQName("cm", "content", namespacePrefixResolver));
-        assertEquals(21, answer.size());
+        assertEquals(4, answer.size());
 
         answer = permissionService.getSettablePermissions(QName.createQName("cm", "folder", namespacePrefixResolver));
         assertEquals(4, answer.size());