diff --git a/config/alfresco/form-services-context.xml b/config/alfresco/form-services-context.xml
index 84aa8c8c09..b73c228415 100644
--- a/config/alfresco/form-services-context.xml
+++ b/config/alfresco/form-services-context.xml
@@ -57,6 +57,9 @@
           
     <bean id="typeFilterRegistry"
           class="org.alfresco.repo.forms.processor.FilterRegistry" />
+          
+    <bean id="workflowFilterRegistry"
+          class="org.alfresco.repo.forms.processor.FilterRegistry" />
     
     <!-- Form processors  -->
     <bean id="baseFormProcessor" abstract="true" init-method="register"
@@ -96,6 +99,21 @@
         </property>
     </bean>
     
+    <bean id="workflowFormProcessor" 
+          class="org.alfresco.repo.forms.processor.workflow.WorkflowFormProcessor" 
+          parent="filteredFormProcessor">
+        <property name="filterRegistry" ref="workflowFilterRegistry" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="fileFolderService" ref="FileFolderService" />
+        <property name="dictionaryService" ref="DictionaryService" />
+        <property name="namespaceService" ref="NamespaceService" />
+        <property name="contentService" ref="ContentService" />
+        <property name="workflowService" ref="WorkflowService" />
+        <property name="matchPattern">
+            <value>workflow</value>
+        </property>
+    </bean>
+    
     <!--  Filters -->
     <bean id="baseFormFilter" abstract="true" init-method="register"
           class="org.alfresco.repo.forms.processor.AbstractFilter" />
diff --git a/source/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
new file mode 100644
index 0000000000..1ace22484d
--- /dev/null
+++ b/source/java/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessor.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.forms.processor.workflow;
+
+import org.alfresco.repo.forms.processor.node.TypeFormProcessor;
+import org.alfresco.service.cmr.workflow.WorkflowService;
+
+/**
+ * Temporary FormProcessor implementation that can generate and persist 
+ * Form objects for workflow definitions.
+ *
+ * @author Gavin Cornwell
+ */
+public class WorkflowFormProcessor extends TypeFormProcessor
+{
+    protected WorkflowService workflowService;
+    
+    /**
+     * Sets the workflow service
+     * 
+     * @param workflowService The WorkflowService instance
+     */
+    public void setWorkflowService(WorkflowService workflowService)
+    {
+        this.workflowService = workflowService;
+    }
+}