diff --git a/source/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java b/source/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
index 4034c3ca65..12ceb992fb 100644
--- a/source/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
+++ b/source/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java
@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.invitation.InvitationService;
@@ -335,6 +336,13 @@ public class MockedTestServiceRegistry implements ServiceRegistry
     }
     
     
+    public CalendarService getCalendarService()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+    
+    
     public FileFolderService getFileFolderService()
     {
         // TODO Auto-generated method stub
diff --git a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
index 7262b1c537..1fa862d27b 100644
--- a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
+++ b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.invitation.InvitationService;
@@ -543,6 +544,15 @@ public class ServiceDescriptorRegistry
         return (NodeLocatorService)getService(NODE_LOCATOR_SERVICE);
     }
     
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.service.ServiceRegistry#getCalendarService()
+     */
+    public CalendarService getCalendarService() 
+    {
+        return (CalendarService)getService(CALENDAR_SERVICE);
+    }
+    
     /* (non-Javadoc)
      * @see org.alfresco.service.ServiceRegistry#getInvitationService()
      */
diff --git a/source/java/org/alfresco/service/ServiceRegistry.java b/source/java/org/alfresco/service/ServiceRegistry.java
index 4f1029a907..9a2edda1bd 100644
--- a/source/java/org/alfresco/service/ServiceRegistry.java
+++ b/source/java/org/alfresco/service/ServiceRegistry.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.invitation.InvitationService;
@@ -138,6 +139,7 @@ public interface ServiceRegistry
     static final QName RATING_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RatingService");
     static final QName REPO_ADMIN_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RepoAdminService");
     static final QName NODE_LOCATOR_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "nodeLocatorService");
+    static final QName CALENDAR_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "CalendarService");
     
     // WCM / AVM
     static final QName AVM_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AVMService");
@@ -517,6 +519,13 @@ public interface ServiceRegistry
     @NotAuditable
     NodeLocatorService getNodeLocatorService();
     
+    /**
+     * Get the calendar service (or null if one is not provided)
+     * @return
+     */
+    @NotAuditable
+    CalendarService getCalendarService();
+    
     /**
      * Get the invitation service (or null if one is not provided)
      * @return the invitation service