diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index b63f714048..b6ca12dc13 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -178,6 +178,10 @@
                     <prop key="location">alfresco/templates/software_engineering_project.xml</prop>
                     <prop key="messages">alfresco/messages/bootstrap-templates</prop>
                 </props>
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop>
+                    <prop key="location">alfresco/templates/collaboration_project.xml</prop>
+                </props>
                 <props>
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
                     <prop key="location">alfresco/templates/content_template_examples.xml</prop>
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index f7f198d095..63b4e23014 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -191,4 +191,6 @@ patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
 
 patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
 
-patch.projectsFolder.description=Adds 'Projects' folder to Company Home.
\ No newline at end of file
+patch.projectsFolder.description=Adds 'Projects' folder to Company Home.
+
+patch.projectTemplate.description=Adds the default Project template folder to the Space Templates folder.
\ No newline at end of file
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 0d52893383..0cacefe7e2 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1188,4 +1188,25 @@
         </property>
     </bean>
     
+    <bean id="patch.projectTemplate" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.projectTemplate</value></property>
+        <property name="description"><value>patch.projectTemplate.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>115</value></property>
+        <property name="targetSchema"><value>116</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <!--<property name="checkPath">
+            <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}/app:projectfolder</value>
+        </property>-->
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop>
+                <prop key="location">alfresco/templates/collaboration_project.xml</prop>
+            </props>
+        </property>
+    </bean>
+    
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/templates/collaboration_project.xml b/config/alfresco/templates/collaboration_project.xml
new file mode 100644
index 0000000000..c8037fe1c8
--- /dev/null
+++ b/config/alfresco/templates/collaboration_project.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
+  <view:metadata>
+    <view:exportBy>admin</view:exportBy>
+    <view:exportDate>2007-12-04T13:25:22.829Z</view:exportDate>
+    <view:exporterVersion>2.9.0 (dev r7521)</view:exporterVersion>
+    <view:exportOf>/app:company_home/app:projects</view:exportOf>
+  </view:metadata>
+  <app:projectfolder xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/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: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:emailserver="http://www.alfresco.org/model/emailserver/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:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:ia="com.infoaxon.alfresco.calendar" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:wca="http://www.alfresco.org/model/wcmappmodel/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns:reg="http://www.alfresco.org/system/registry/1.0" xmlns:module="http://www.alfresco.org/system/modules/1.0" xmlns="" view:childName="cm:New Project">
+    <view:aspects>
+      <cm:auditable></cm:auditable>
+      <sys:referenceable></sys:referenceable>
+      <app:uifacets></app:uifacets>
+    </view:aspects>
+    <view:properties>
+      <cm:description></cm:description>
+      <app:icon>project</app:icon>
+      <sys:node-uuid>b4e91bed-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+      <sys:node-dbid>472</sys:node-dbid>
+      <cm:title></cm:title>
+      <cm:created>2007-12-03T21:50:04.921Z</cm:created>
+      <cm:modifier>admin</cm:modifier>
+      <cm:modified>2007-12-03T21:50:04.937Z</cm:modified>
+      <cm:creator>admin</cm:creator>
+      <sys:store-protocol>workspace</sys:store-protocol>
+      <cm:name>New Project</cm:name>
+      <sys:store-identifier>SpacesStore</sys:store-identifier>
+    </view:properties>
+    <view:associations>
+      <cm:contains>
+        <cm:folder view:childName="cm:Image Gallery">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:webscriptable></cm:webscriptable>
+            <cm:projectsummary></cm:projectsummary>
+          </view:aspects>
+          <view:properties>
+            <cm:description></cm:description>
+            <app:icon>project-icon-gallery</app:icon>
+            <sys:node-uuid>725495c6-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>466</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:48:13.203Z</cm:created>
+            <cm:webscript>/wcs/collaboration/gallery/view/{noderef}</cm:webscript>
+            <cm:summaryWebscript>/wcs/collaboration/gallerySummary</cm:summaryWebscript>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:48:13.234Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Image Gallery</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+          </view:properties>
+          <view:associations></view:associations>
+        </cm:folder>
+        <cm:folder view:childName="cm:Blog Posts">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:webscriptable></cm:webscriptable>
+            <cm:projectsummary></cm:projectsummary>
+          </view:aspects>
+          <view:properties>
+            <cm:description></cm:description>
+            <app:icon>project-icon-blog</app:icon>
+            <sys:node-uuid>79f7b1a5-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>467</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:48:26.031Z</cm:created>
+            <cm:webscript>/wcs/collaboration/blogSpace?nodeRef={noderef}</cm:webscript>
+            <cm:summaryWebscript>/wcs/collaboration/blogSummary</cm:summaryWebscript>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:48:26.093Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Blog Posts</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+          </view:properties>
+          <view:associations></view:associations>
+        </cm:folder>
+        <ia:calendar view:childName="cm:Calendar">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:projectsummary></cm:projectsummary>
+            <cm:webscriptable></cm:webscriptable>
+          </view:aspects>
+          <view:properties>
+            <cm:webscript>/wcs/collaboration/calendar?nodeRef={noderef}</cm:webscript>
+            <cm:summaryWebscript>/wcs/collaboration/calendarSummary</cm:summaryWebscript>
+            <cm:description></cm:description>
+            <app:icon>project-icon-calendar</app:icon>
+            <sys:node-uuid>7ff24daa-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>468</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:48:36.125Z</cm:created>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:48:36.140Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Calendar</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+          </view:properties>
+          <view:associations></view:associations>
+        </ia:calendar>
+        <cm:folder view:childName="cm:Document Library">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:webscriptable></cm:webscriptable>
+            <cm:projectsummary></cm:projectsummary>
+          </view:aspects>
+          <view:properties>
+            <cm:description></cm:description>
+            <app:icon>project-icon-doclibrary</app:icon>
+            <sys:node-uuid>8741cb52-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>469</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:48:48.328Z</cm:created>
+            <cm:webscript>/wcs/collaboration/docLibrary?nodeRef={noderef}</cm:webscript>
+            <cm:summaryWebscript>/wcs/collaboration/docSummary</cm:summaryWebscript>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:48:48.343Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Document Library</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+          </view:properties>
+          <view:associations></view:associations>
+        </cm:folder>
+        <cm:folder view:childName="cm:Email Archive">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:projectsummary></cm:projectsummary>
+            <cm:webscriptable></cm:webscriptable>
+          </view:aspects>
+          <view:properties>
+            <cm:description></cm:description>
+            <app:icon>project-icon-emailarchive</app:icon>
+            <sys:node-uuid>90b365ad-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>470</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:49:04.156Z</cm:created>
+            <cm:webscript>/wcs/collaboration/docLibrary?nodeRef={noderef}</cm:webscript>
+            <cm:summaryWebscript>/wcs/collaboration/emailSummary</cm:summaryWebscript>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:49:04.171Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Email Archive</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+          </view:properties>
+          <view:associations></view:associations>
+        </cm:folder>
+        <fm:forums view:childName="cm:Forums">
+          <view:aspects>
+            <cm:auditable></cm:auditable>
+            <sys:referenceable></sys:referenceable>
+            <app:uifacets></app:uifacets>
+            <cm:projectsummary></cm:projectsummary>
+          </view:aspects>
+          <view:properties>
+            <cm:description></cm:description>
+            <app:icon>project-icon-forums</app:icon>
+            <sys:node-uuid>a3cd60c2-a1e9-11dc-ae66-e717b8dfc153</sys:node-uuid>
+            <sys:node-dbid>471</sys:node-dbid>
+            <cm:title></cm:title>
+            <cm:created>2007-12-03T21:49:36.218Z</cm:created>
+            <cm:modifier>admin</cm:modifier>
+            <cm:modified>2007-12-03T21:49:36.250Z</cm:modified>
+            <cm:creator>admin</cm:creator>
+            <sys:store-protocol>workspace</sys:store-protocol>
+            <cm:name>Forums</cm:name>
+            <sys:store-identifier>SpacesStore</sys:store-identifier>
+            <cm:summaryWebscript>/wcs/collaboration/forumSummary</cm:summaryWebscript>
+          </view:properties>
+          <view:associations></view:associations>
+        </fm:forums>
+      </cm:contains>
+    </view:associations>
+  </app:projectfolder>
+</view:view>
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 0efe5e7624..5d710b0acc 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=117
+version.schema=116