diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 334a968419..e61f33dc0a 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -227,4 +227,7 @@ patch.sitePermissionRefactorPatch.result=Groups have been created for all sites
 patch.migrateVersionStore.description=Migrate from lightWeightVersionStore to version2Store
 patch.migrateVersionStore.result=Migrated version store. Created {0} version histories
 
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
\ No newline at end of file
+patch.inviteEmailTemplate.description=Adds invite email template to invite space
+
+patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
+patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
\ No newline at end of file
diff --git a/config/alfresco/model/calendarModel.xml b/config/alfresco/model/calendarModel.xml
index c495c2bb10..fd19a88046 100644
--- a/config/alfresco/model/calendarModel.xml
+++ b/config/alfresco/model/calendarModel.xml
@@ -8,7 +8,7 @@
    <version>1.0</version>
 
    <imports>
-   	  <!-- Import Alfresco Dictionary Definitions -->
+   	<!-- 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"/>
@@ -16,7 +16,7 @@
 
    <!-- Introduction of new namespaces defined by this model -->
    <namespaces>
-      <namespace uri="com.infoaxon.alfresco.calendar" prefix="ia"/>
+      <namespace uri="http://www.alfresco.org/model/calendar" prefix="ia"/>
    </namespaces>
 
    <types>
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index df1d979c1f..00427b4c42 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -465,14 +465,14 @@
             <value>classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-1.sql</value>
         </property>
     </bean>
-    <bean id="patch.uniqueChildName" class="org.alfresco.repo.admin.patch.impl.NoLongerSupportedPatch" parent="basePatch" >
+    <bean id="patch.uniqueChildName" class="org.alfresco.repo.admin.patch.impl.NoLongerSupportedPatch" parent="basePatch" >
         <property name="id"><value>patch.uniqueChildName</value></property>
         <property name="description"><value>patch.uniqueChildName.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>19</value></property>
         <property name="targetSchema"><value>20</value></property>
-        <property name="lastSupportedVersion" >
-            <value>2.1.4</value>
+        <property name="lastSupportedVersion" >
+            <value>2.1.4</value>
         </property>
     </bean>
     <bean id="patch.schemaUpdateScript-V1.4-2" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
@@ -1510,5 +1510,23 @@
                 <ref bean="patch.emailTemplatesFolder" />
             </list>
         </property>
-    </bean>        
-</beans>
+    </bean>
+    
+    <bean id="patch.calendarNamespaceUri" class="org.alfresco.repo.admin.patch.impl.CalendarModelUriPatch" parent="basePatch" >
+        <property name="id"><value>patch.calendarNamespaceUri</value></property>
+        <property name="description"><value>patch.calendarModelNamespacePatch.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>131</value></property>
+        <property name="targetSchema"><value>132</value></property>
+        <!-- helper beans -->
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="indexerAndSearcherFactory" />
+        </property>
+        <property name="qnameDAO">
+            <ref bean="qnameDAO" />
+        </property>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index d299fe6692..d852fa3014 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=131
\ No newline at end of file
+version.schema=132
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java
new file mode 100644
index 0000000000..81566bd1e9
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/CalendarModelUriPatch.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+
+package org.alfresco.repo.admin.patch.impl;
+
+import org.alfresco.i18n.I18NUtil;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.domain.QNameDAO;
+import org.alfresco.repo.importer.ImporterBootstrap;
+import org.alfresco.repo.search.Indexer;
+import org.alfresco.repo.search.IndexerAndSearcher;
+import org.alfresco.repo.search.impl.lucene.QueryParser;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+
+/**
+ * Patch usr:user and cm:person objects so that the user name properties are in the 
+ * index in untokenized form. If not authentication may fail in mixed language use. 
+ * 
+ * @author andyh
+ *
+ */
+public class CalendarModelUriPatch extends AbstractPatch
+{
+    private static final String MSG_SUCCESS = "patch.calendarModelNamespacePatch.result";
+    
+    private static final String URI_BEFORE = "com.infoaxon.alfresco.calendar";
+    private static final String URI_AFTER  = "http://www.alfresco.org/model/calendar";
+    
+    private ImporterBootstrap importerBootstrap;
+    private IndexerAndSearcher indexerAndSearcher;
+    private QNameDAO qnameDAO;
+    
+    
+    public void setImporterBootstrap(ImporterBootstrap importerBootstrap)
+    {
+        this.importerBootstrap = importerBootstrap;
+    }
+    
+    public void setIndexerAndSearcher(IndexerAndSearcher indexerAndSearcher)
+    {
+        this.indexerAndSearcher = indexerAndSearcher;
+    }
+    
+    public void setQnameDAO(QNameDAO qnameDAO)
+    {
+        this.qnameDAO = qnameDAO;
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        // modify namespace for all calendar entries
+        qnameDAO.updateNamespaceEntity(URI_BEFORE, URI_AFTER);
+        
+        // reindex the calendar entries
+        int count = reindex("TYPE:\\{" + QueryParser.escape(URI_BEFORE) + "\\}*", importerBootstrap.getStoreRef());
+        return I18NUtil.getMessage(MSG_SUCCESS, count);
+    }
+    
+    private int reindex(String query, StoreRef store)
+    {
+        SearchParameters sp = new SearchParameters();
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery(query);
+        sp.addStore(store);
+        Indexer indexer = indexerAndSearcher.getIndexer(store);
+        ResultSet rs = null;
+        int count = 0;
+        try
+        {
+            rs = searchService.query(sp);
+            count = rs.length();
+            for (ResultSetRow row : rs)
+            {
+                indexer.updateNode(row.getNodeRef());
+            }
+        }
+        finally
+        {
+            if (rs != null)
+            {
+                rs.close();
+            }
+        }
+        return count;
+    }
+}