diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 661faa9532..2da4ead2bb 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -20,7 +20,7 @@
     <import resource="classpath:alfresco/extension/extension-context.xml" />
     <import resource="classpath:alfresco/authority-services-context.xml" />
     <import resource="classpath:alfresco/authentication-services-context.xml" />
-    <import resource="classpath:alfresco/patch-services-context.xml" />
+    <import resource="classpath:alfresco/patch/*.xml" />
 
     <!-- Import custom and overriding bean definitions.  This must be done after the Alfresco-maintained beans. -->
     <!-- e.g.
diff --git a/config/alfresco/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
similarity index 77%
rename from config/alfresco/patch-services-context.xml
rename to config/alfresco/patch/patch-services-context.xml
index 3ec779e1f4..5745e01e95 100644
--- a/config/alfresco/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -40,25 +40,27 @@
         <property name="patchDaoService">
             <ref bean="patchDaoComponent" />
         </property>
-        <!-- list all the patches -->
-        <property name="patches" >
-            <list>
-            </list>
-        </property>
+    </bean>
+
+    <!-- base patch definition -->
+    <bean id="basePatch" abstract="true" depends-on="patchComponent" init-method="init">
+        <property name="transactionService"><ref bean="transactionComponent" /></property>
     </bean>
     
     <!-- Example patches -->
-    <bean id="patch.sample.01" class="org.alfresco.repo.admin.patch.SamplePatch" >
-        <property name="transactionService"><ref bean="transactionComponent" /></property>
+    <bean id="patch.sample.01" class="org.alfresco.repo.admin.patch.SamplePatch" parent="basePatch" >
         <property name="id"><value>Sample01</value></property>
         <property name="description"><value>A NO-OP sample patch</value></property>
-        <property name="applyToVersion"><value>0.0</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>1000</value></property>
+        <property name="targetSchema"><value>1001</value></property>
     </bean>
-    <bean id="patch.sample.02" class="org.alfresco.repo.admin.patch.SamplePatch" >
-        <property name="transactionService"><ref bean="transactionComponent" /></property>
+    <bean id="patch.sample.02" class="org.alfresco.repo.admin.patch.SamplePatch" parent="basePatch" >
         <property name="id"><value>Sample02</value></property>
         <property name="description"><value>A NO-OP sample patch</value></property>
-        <property name="applyToVersion"><value>1.2</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>1000</value></property>
+        <property name="targetSchema"><value>1001</value></property>
         <property name="dependsOn" >
             <list>
                 <ref bean="patch.sample.01" />