diff --git a/config/alfresco/bootstrap/formsSpace.xml b/config/alfresco/bootstrap/formsSpace.xml
new file mode 100644
index 0000000000..d89a5b1112
--- /dev/null
+++ b/config/alfresco/bootstrap/formsSpace.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
+  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:wcm="http://www.alfresco.org/model/wcmmodel/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wcmwf="http://www.alfresco.org/model/wcmworkflow/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" 
+             view:childName="app:forms">
+    <view:aspects>
+      <app:uifacets></app:uifacets>
+    </view:aspects>
+    <view:properties>
+      <cm:description>Content Forms</cm:description>
+      <app:icon>space-icon-default</app:icon>
+      <cm:title>Forms</cm:title>
+      <cm:name>Forms</cm:name>
+    </view:properties>
+  </cm:folder>
+</view:view>
\ No newline at end of file
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index dacb3856ed..9bc4fafc61 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -316,8 +316,9 @@
                 <prop key="spaces.savedsearches.childname">${spaces.savedsearches.childname}</prop>
                 <prop key="spaces.scripts.childname">${spaces.scripts.childname}</prop>
                 <prop key="spaces.wcm.childname">${spaces.wcm.childname}</prop>
+                <prop key="spaces.wcm_content_forms.childname">${spaces.wcm_content_forms.childname}</prop>
                 <prop key="spaces.content_forms.childname">${spaces.content_forms.childname}</prop>
-				    <prop key="spaces.user_homes.childname">${spaces.user_homes.childname}</prop>
+				<prop key="spaces.user_homes.childname">${spaces.user_homes.childname}</prop>
             </props>
         </property>
     </bean>
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 784c216f8a..550ef83307 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -173,11 +173,11 @@ patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folder
 patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
 patch.AVMProperties.result=Properties were moved.
 
-patch.customModels.description=Adds Models space to Data Dictionary.
-patch.customMessages.description=Adds Messages space to Data Dictionary.
-patch.customWebClientExtension.description=Adds Web Client Extension space to Data Dictionary.
+patch.customModels.description=Adds 'Models' folder to Data Dictionary
+patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
+patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
 
-patch.customWorkflowDefs.description=Adds Workflow Definitions space to Data Dictionary.
+patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
 
 patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
 
@@ -186,3 +186,6 @@ patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore a
 
 patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
 patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
+
+patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary
+
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 34813884bf..0478aa2924 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1123,5 +1123,26 @@
             <ref bean="indexerAndSearcherFactory" />
         </property>
     </bean>
-
+  
+    <bean id="patch.formsFolder" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.formsFolder</value></property>
+        <property name="description"><value>patch.formsFolder.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>112</value></property>
+        <property name="targetSchema"><value>113</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="checkPath">
+            <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/app:forms</value>
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}</prop>
+                <prop key="location">alfresco/bootstrap/formsSpace.xml</prop>
+            </props>
+        </property>
+    </bean>
+    
 </beans>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 06f9a7eec9..a29a913819 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -146,7 +146,8 @@ spaces.templates.rss.childname=app:rss_templates
 spaces.savedsearches.childname=app:saved_searches
 spaces.scripts.childname=app:scripts
 spaces.wcm.childname=app:wcm
-spaces.content_forms.childname=app:wcm_forms
+spaces.wcm_content_forms.childname=app:wcm_forms
+spaces.content_forms.childname=app:forms
 spaces.user_homes.childname=app:user_homes
 
 # Folders for storing people
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 5c6fd6afd0..61c9dc2dc7 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=112
+version.schema=113