diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index a224899a39..30625695d7 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -240,6 +240,16 @@
                     <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
                 </props>
                 
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts/cm:org/cm:alfresco</prop>
+                    <prop key="location">alfresco/bootstrap/calendar_webscripts.acp</prop>
+                </props>
+                
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
+                    <prop key="location">alfresco/bootstrap/calendar_templates.acp</prop>
+                </props>
+                
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/bootstrap/calendar_templates.acp b/config/alfresco/bootstrap/calendar_templates.acp
new file mode 100644
index 0000000000..84765d0a2b
Binary files /dev/null and b/config/alfresco/bootstrap/calendar_templates.acp differ
diff --git a/config/alfresco/bootstrap/calendar_webscripts.acp b/config/alfresco/bootstrap/calendar_webscripts.acp
new file mode 100644
index 0000000000..4efab5f03e
Binary files /dev/null and b/config/alfresco/bootstrap/calendar_webscripts.acp differ
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index ac3c832015..cdc7bb94e3 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -690,6 +690,9 @@
                 
                 <!-- Email model -->
                 <value>alfresco/model/emailServerModel.xml</value>
+                
+                <!-- Calendar model -->
+                <value>alfresco/model/calendarModel.xml</value>
 
                 <!-- Deprecated types -->
                 <value>alfresco/model/deprecated/deprecated_contentModel.xml</value>
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index d97c213656..af2b169430 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -187,7 +187,12 @@ 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
+patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
 
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root
+patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
 
+patch.projectsFolder.description=Adds 'Projects' folder to Company Home.
+
+patch.calendarWebscripts.description=Add the Calendar space webscripts to Data Dictionary.
+
+patch.calendarTemplates.description=Add the Calendar templates to the Data Dictionary.
\ No newline at end of file
diff --git a/config/alfresco/model/calendarModel.xml b/config/alfresco/model/calendarModel.xml
new file mode 100644
index 0000000000..c495c2bb10
--- /dev/null
+++ b/config/alfresco/model/calendarModel.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<model name="ia:CalendarEventModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+   <!-- Optional meta-data about the model -->   
+   <description>Calendar Event Model</description>
+   <author>Snig Bhaumik</author>
+   <version>1.0</version>
+
+   <imports>
+   	  <!-- Import Alfresco Dictionary Definitions -->
+      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+      <!-- Import Alfresco Content Domain Model Definitions -->
+      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+   </imports>
+
+   <!-- Introduction of new namespaces defined by this model -->
+   <namespaces>
+      <namespace uri="com.infoaxon.alfresco.calendar" prefix="ia"/>
+   </namespaces>
+
+   <types>
+      <type name="ia:calendarEvent">
+         <title>Calendar Event</title>
+         <parent>cm:content</parent>
+         <properties>
+            <property name="ia:whatEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:fromDate">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:toDate">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:whereEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:descriptionEvent">
+               <type>d:text</type>
+            </property>
+            <property name="ia:colorEvent">
+               <type>d:text</type>
+            </property>
+         </properties>
+      </type>
+      
+      <type name="ia:calendar">
+         <title>Calendar Space</title>
+         <parent>cm:folder</parent>
+         <properties>
+            <property name="ia:whatEventDefault">
+               <type>d:text</type>
+            </property>
+            <property name="ia:fromDateDefault">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:toDateDefault">
+               <type>d:datetime</type>
+            </property>
+            <property name="ia:whereEventDefault">
+               <type>d:text</type>
+            </property>
+            <property name="ia:colorEventDefault">
+               <type>d:text</type>
+            </property>
+		   </properties>
+         <associations>
+   			<association name="ia:subscribedCalendarList">
+   				<source>
+   					<mandatory>false</mandatory>
+   					<many>true</many>
+   				</source>
+   				<target>
+   					<class>ia:calendar</class>
+   					<mandatory>false</mandatory>
+   					<many>true</many>
+   				</target>
+   			</association>
+   		</associations>
+      </type>
+   </types>
+   
+</model>
\ 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 f6106a21d7..bcdc936a90 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1168,7 +1168,7 @@
     
     <bean id="patch.projectsFolder" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.projectsFolder</value></property>
-        <property name="description"><value>patch.formsFolder.description</value></property>
+        <property name="description"><value>patch.projectsFolder.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>114</value></property>
         <property name="targetSchema"><value>115</value></property>
@@ -1188,4 +1188,43 @@
         </property>
     </bean>
     
-</beans>
+    <bean id="patch.calendarWebscripts" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.calendarWebscripts</value></property>
+        <property name="description"><value>patch.calendarWebscripts.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}/cm:webscripts/cm:org/cm:alfresco/cm:calendar</value>
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/cm:webscripts/cm:org/cm:alfresco</prop>
+                <prop key="location">alfresco/bootstrap/calendar_webscripts.acp</prop>
+            </props>
+        </property>
+    </bean>
+    
+    <bean id="patch.calendarTemplates" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.calendarTemplates</value></property>
+        <property name="description"><value>patch.calendarTemplates.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>116</value></property>
+        <property name="targetSchema"><value>117</value></property>
+        <!-- bootstrap view -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</prop>
+                <prop key="location">alfresco/bootstrap/calendar_templates.acp</prop>
+            </props>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 6f435a81bc..0efe5e7624 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=115
+version.schema=117