diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
index bcf0d02864..c03365f781 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.get.json.ftl
@@ -8,14 +8,28 @@
    "description": "${result.description}",
    "location": "${result.location}",
    "tags": [<#list result.tags as tag>"${tag}"<#if tag_has_next>,</#if></#list>],
+   "startAt": {
+       "iso8601": "${xmldate(result.from)}",
+       "legacyDate": "${result.from?string("M/d/yyyy")}",
+       "legacyTime": "${result.from?string("HH:mm")}",
+   },
+   "endAt": {
+       "iso8601": "${xmldate(result.to)}",
+       "legacyDate": "${result.to?string("M/d/yyyy")}",
+       "legacyTime": "${result.to?string("HH:mm")}",
+   },
+   "allday": "${result.allday?string}",
+
+   <#-- These are the old ones we'll get rid of soon -->
    "from": "${result.from?string("M/d/yyyy")}",
    "start": "${result.from?string("HH:mm")}",
    "to": "${result.to?string("M/d/yyyy")}",
    "end": "${result.to?string("HH:mm")}",
-   "allday": "${result.allday?string}",
+
+
    "docfolder": "${result.docfolder}",
    "recurrence": "${result.recurrence}",
    "isoutlook": "${result.isoutlook?string}"
 </#if>
 }
-</#escape>
\ No newline at end of file
+</#escape>
diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
index d355276a28..a2245aecfa 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarEntryGet.java
@@ -21,14 +21,10 @@ package org.alfresco.repo.web.scripts.calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.repo.model.Repository;
 import org.alfresco.service.cmr.calendar.CalendarEntry;
 import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
-import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteService;
 import org.springframework.extensions.webscripts.Cache;
-import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 
@@ -64,8 +60,8 @@ public class CalendarEntryGet extends AbstractCalendarWebScript
       result.put("isoutlook", entry.isOutlook());
       result.put("outlookuid", entry.getOutlookUID());
       result.put("allday", CalendarEntryDTO.isAllDay(entry));
+      result.put("docfolder", entry.getSharePointDocFolder());
       result.put("recurrence", null); // TODO
-      result.put("docfolder", null); // TODO
       
       // Replace nulls with blank strings for the JSON
       for(String key : result.keySet())
diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
index 67a85b9125..017c285c07 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/CalendarRestApiTest.java
@@ -360,6 +360,14 @@ public class CalendarRestApiTest extends BaseWebScriptTest
        assertEquals("13:00", entry.getString("end"));
        assertEquals("false", entry.getString("allday"));
        
+       // Check the new style dates too
+//       assertEquals("2011-06-29T12:00:00Z", entry.getJSONObject("startAt").get("iso8601")); // TODO Needs TZ going in
+       assertEquals("6/29/2011", entry.getJSONObject("startAt").get("legacyDate"));
+       assertEquals("12:00", entry.getJSONObject("startAt").get("legacyTime"));
+//       assertEquals("2011-06-29T13:00:00Z", entry.getJSONObject("endAt").get("iso8601")); // TODO Needs TZ going in
+       assertEquals("6/29/2011", entry.getJSONObject("endAt").get("legacyDate"));
+       assertEquals("13:00", entry.getJSONObject("endAt").get("legacyTime"));
+       
        
        // Edit
        entry = updateEntry(name, EVENT_TITLE_ONE, "More Where", "More Thing", Status.STATUS_OK);