diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index cfcc721df1..748086dea8 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -57,6 +57,11 @@
        <property name="localSessionFactory">
           <ref bean="&amp;sessionFactory"></ref>  <!-- inject the actual factory, not a session -->
        </property>
+       <!--
+       <property name="activitiProcessEngine">
+          <ref bean="activitiProcessEngine" />
+       </property>
+       -->
        <property name="dialect">
           <ref bean="dialect" />
        </property>
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index eef4265fd5..a5f301c64c 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -41,6 +41,7 @@ import java.util.Properties;
 
 import javax.sql.DataSource;
 
+import org.activiti.engine.ProcessEngine;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.ibatis.SerializableTypeHandler;
 import org.alfresco.repo.admin.patch.Patch;
@@ -194,6 +195,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
     
     private DataSource dataSource;
     private LocalSessionFactoryBean localSessionFactory;
+    private ProcessEngine activitiProcessEngine;
     private String schemaOuputFilename;
     private boolean updateSchema;
     private boolean stopAfterSchemaBootstrap;
@@ -235,6 +237,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean
     {
         return localSessionFactory;
     }
+    
+    public void setActivitiProcessEngine(ProcessEngine processEngine)
+    {
+        this.activitiProcessEngine = processEngine;
+    }
 
     /**
      * Set this to output the full database creation script
@@ -789,6 +796,9 @@ public class SchemaBootstrap extends AbstractLifecycleBean
             checkSchemaPatchScripts(cfg, connection, postUpdateScriptPatches, true);
         }
         
+        // Ask emebedded Activiti to create or update it's schema
+//        activitiProcessEngine.getManagementService().databaseSchemaUpgrade(connection, null, null);
+        
         return create;
     }