diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index b1ff503d76..1381d6c39e 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -464,6 +464,7 @@
         <property name="objectDefinitionSource">
             <value>
                 <![CDATA[
+                org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.isFilePlan=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.existsUnfiledContainer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getUnfiledContainer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createUnfiledContainer=RM.Write.0
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
index 128b086188..e04f64970c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java
@@ -30,6 +30,7 @@ import java.util.Set;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.RenditionModel;
+import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
@@ -393,10 +394,13 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl
     
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementService#isFilePlan(org.alfresco.service.cmr.repository.NodeRef)
+     * 
+     * @deprecated As of 2.1, see {@link FilePlanService#isFilePlan(NodeRef)}
      */
+    @Deprecated
     public boolean isFilePlan(NodeRef nodeRef)
     {
-        return instanceOf(nodeRef, TYPE_FILE_PLAN);
+        return serviceRegistry.getFilePlanService().isFilePlan(nodeRef);
     }
     
     /**
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
index 38206e6091..85c7fc058b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java
@@ -23,6 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditSe
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
 import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
+import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
 import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
@@ -54,6 +55,7 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     static final QName RECORD_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RecordService");
     static final QName FREEZE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FreezeService");
     static final QName EXTENDED_SECURITY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ExtendedSecurityService");
+    static final QName FILE_PLAN_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FilePlanService");
     static final QName FILE_PLAN_ROLE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FilePlanRoleService");
     static final QName FILE_PLAN_PERMISSION_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "FilePlanPermissionService");
     @Deprecated
@@ -132,6 +134,13 @@ public interface RecordsManagementServiceRegistry extends ServiceRegistry
     @NotAuditable
     ExtendedSecurityService getExtendedSecurityService();
     
+    /**
+     * @return  file plan service
+     * @since 2.1 
+     */
+    @NotAuditable
+    FilePlanService getFilePlanService();
+    
     /**
      * @return  file plan role service
      * @since 2.1
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
index 31d3fc3a54..d920d250c5 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java
@@ -23,6 +23,7 @@ import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditSe
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
 import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
+import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
@@ -138,6 +139,15 @@ public class RecordsManagementServiceRegistryImpl extends ServiceDescriptorRegis
     {
         return (ExtendedSecurityService) getService(EXTENDED_SECURITY_SERVICE);
     }
+    
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getFilePlanService()
+     */
+    @Override
+    public FilePlanService getFilePlanService()
+    {
+        return (FilePlanService) getService(FILE_PLAN_SERVICE);
+    }
 
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry#getFilePlanRoleService()
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
index 0ee94a85d7..626d74a84e 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
@@ -256,9 +256,9 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
 
     /** Specific declarative capability tests */
 
-    public void testFileCapability()
+    public void testCreateRecordCapability()
     {
-        final Capability capability = capabilityService.getCapability("File");
+        final Capability capability = capabilityService.getCapability("CreateRecords");
         assertNotNull(capability);
 
         doTestInTransaction(new Test<Void>()
@@ -285,8 +285,8 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
             public Void run()
             {
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(rmContainer));
-                assertEquals(AccessStatus.ALLOWED, capability.hasPermission(rmFolder));
-                assertEquals(AccessStatus.ALLOWED, capability.hasPermission(record));
+                assertEquals(AccessStatus.DENIED, capability.hasPermission(rmFolder));
+                assertEquals(AccessStatus.DENIED, capability.hasPermission(record));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(declaredRecord));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(frozenRecordFolder));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(recordFolderContainsFrozen));
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
index 250fda524b..790feb1d87 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java
@@ -85,6 +85,7 @@ public class RecordsManagementServiceImplTest extends BaseRMTestCase
     /**
      * @see RecordsManagementService#isFilePlan(NodeRef)
      */
+    @SuppressWarnings("deprecation")
     public void testIsFilePlan() throws Exception
     {
         doTestInTransaction(new Test<NodeRef>()
@@ -92,9 +93,9 @@ public class RecordsManagementServiceImplTest extends BaseRMTestCase
             @Override
             public NodeRef run()
             {
-                assertTrue("This is a records management root", filePlanService.isFilePlan(filePlan));
-                assertFalse("This should not be a records management root", filePlanService.isFilePlan(rmContainer));
-                assertFalse("This should not be a records management root", filePlanService.isFilePlan(rmFolder));
+                assertTrue("This is a records management root", rmService.isFilePlan(filePlan));
+                assertFalse("This should not be a records management root", rmService.isFilePlan(rmContainer));
+                assertFalse("This should not be a records management root", rmService.isFilePlan(rmFolder));
                 
                 return null;
             }