diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
index bef0f1ec0f..a62a1d619a 100644
--- a/config/alfresco/bootstrap/spaces.xml
+++ b/config/alfresco/bootstrap/spaces.xml
@@ -78,6 +78,13 @@
                   <cm:title>${spaces.scripts.name}</cm:title>
                   <cm:description>${spaces.scripts.description}</cm:description>
                </cm:folder>
+               <cm:folder view:childName="${spaces.content_forms.childname}">
+                  <app:uifacets />
+                  <cm:name>${spaces.content_forms.name}</cm:name>
+                  <app:icon>space-icon-default</app:icon>
+                  <cm:title>${spaces.content_forms.name}</cm:title>
+                  <cm:description>${spaces.content_forms.description}</cm:description>
+               </cm:folder>
             </cm:contains>
             </cm:folder>
             <cm:folder view:childName="${spaces.guest_home.childname}">
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index b56d30d461..c38676999e 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -264,6 +264,7 @@
                 <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.content_forms.childname">${spaces.content_forms.childname}</prop>
             </props>
         </property>
     </bean>
diff --git a/config/alfresco/messages/bootstrap-spaces.properties b/config/alfresco/messages/bootstrap-spaces.properties
index f26dc76327..054f2ef113 100644
--- a/config/alfresco/messages/bootstrap-spaces.properties
+++ b/config/alfresco/messages/bootstrap-spaces.properties
@@ -29,3 +29,6 @@ spaces.scripts.description=JavaScript files
 
 spaces.wcm.name=Websites
 spaces.wcm.description=Web Content Management Spaces
+
+spaces.content_forms.name=Content Forms
+spaces.content_forms.description=Web Content Forms
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index d679c9301a..731c6143bc 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -104,6 +104,7 @@ 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
 
 # Folders for storing people