diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
index 70676c0e4d..17ea808657 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
@@ -5,6 +5,9 @@ rm.ghosting.enabled=true
 rm.notification.role=RecordsManager
 # NOTE: the notification subject can now be set within the usual I18N property files per notification template
 
+# Automatic addition of DOD record meta-data
+rm.dodRecords=true
+
 #
 # Turn off imap server attachments if we are using RM.
 # TODO : Longer term needs to have a query based, dynamic 
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
index 85db9e087f..acee93d2c2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-context.xml
@@ -37,6 +37,7 @@
    
    <!--  Model behaviour -->
    <bean id="dod.dod5015RecordAspect" class="org.alfresco.module.org_alfresco_module_rm.dod5015.model.dod.aspect.DOD5015RecordAspect" parent="rm.baseBehaviour">
+      <property name="addDODRecordAspect" value="${rm.dodRecords}"/>
    </bean>
    
 </beans>
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java
index 9cc6235fbf..6ba3630676 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java
@@ -39,6 +39,17 @@ public class DOD5015RecordAspect extends    BaseBehaviourBean
                                  implements NodeServicePolicies.OnAddAspectPolicy,
                                             DOD5015Model
 {
+	/** indicates whether the DOD record aspect should be added or not */
+	private boolean addDODRecordAspect = true;
+	
+	/**
+	 * @param addDODRecordAspect	true if add aspect, false otherwise
+	 */
+	public void setAddDODRecordAspect(boolean addDODRecordAspect) 
+	{
+		this.addDODRecordAspect = addDODRecordAspect;
+	}
+	
     /**
      * Ensure that the DOD record aspect meta-data is applied.
      * 
@@ -54,6 +65,7 @@ public class DOD5015RecordAspect extends    BaseBehaviourBean
     public void onAddAspect(NodeRef nodeRef, QName aspect)
     {
         if (nodeService.exists(nodeRef) == true && 
+        	addDODRecordAspect == true &&
             nodeService.hasAspect(nodeRef, ASPECT_DOD_5015_RECORD) == false)
         {
             nodeService.addAspect(nodeRef, ASPECT_DOD_5015_RECORD, null);