diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 81485cd296..e07de6bc55 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -126,13 +126,13 @@
    </bean>
    
    <!-- Content Metadata Extracters -->
-   <bean class="org.alfresco.repo.content.metadata.PdfBoxMetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.OfficeMetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" />
-   <bean class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" init-method="init" >
+   <bean id="extracter.PDFBox" class="org.alfresco.repo.content.metadata.PdfBoxMetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.Office" class="org.alfresco.repo.content.metadata.OfficeMetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.Mail" class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.Html" class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.MP3" class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" />
+   <bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" init-method="init" >
       <property name="connection">
          <ref bean="openOfficeConnection" />
       </property>
diff --git a/config/alfresco/extension/custom-metadata-extrators-context.xml.sample b/config/alfresco/extension/custom-metadata-extrators-context.xml.sample
new file mode 100644
index 0000000000..621bf25a89
--- /dev/null
+++ b/config/alfresco/extension/custom-metadata-extrators-context.xml.sample
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<!--
+       This sample show how to modify the mappings properties of the new V2.1 Metadata Extractors.
+       In this example, in addition to the default mappings, the field 'user1' is mapped to
+       'cm:description'.  The available source properties is described on the Javadocs of the
+       extracter class.
+-->
+<beans>
+
+    <bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" >
+        <property name="inheritDefaultMapping">
+            <value>true</value>
+        </property>
+        <property name="mappingProperties">
+            <props>
+                <prop key="namespace.prefix.cm">http://www.alfresco.org/model/content/1.0</prop>
+                <prop key="user1">cm:description</prop>
+            </props>
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
index 039fc249c0..bc6d78dd8a 100644
--- a/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
@@ -57,9 +57,11 @@ import com.catcode.odf.OpenDocumentMetadata;
  *   <b>printedBy:</b>
  *   <b>subject:</b>
  *   <b>title:</b>                  --      cm:title
+ *   <b>All user properties</b>
  * </pre>
  * 
  * @author Antti Jokipii
+ * @author Derek Hulley
  */
 public class OpenDocumentMetadataExtracter extends AbstractMappingMetadataExtracter
 {