diff --git a/inc/RRule-v2.php b/inc/RRule-v2.php
index fed5613f..fc9ea279 100644
--- a/inc/RRule-v2.php
+++ b/inc/RRule-v2.php
@@ -131,7 +131,7 @@ class RepeatRuleDateTime extends DateTime {
     $gmt = clone($this);
     if ( isset($this->tzid) && $this->tzid != 'UTC' ) {
       $dtz = parent::getTimezone();
-      $offset = $dtz->getOffset($gmt);
+      $offset = 0 - $dtz->getOffset($gmt);
       $gmt->modify( $offset . ' seconds' );
     }
     return $gmt->format('Ymd\THis\Z');
@@ -226,6 +226,10 @@ class RepeatRule {
   public function __construct( $basedate, $rrule ) {
     $this->base = ( is_object($basedate) ? $basedate : new RepeatRuleDateTime($basedate) );
 
+    if ( $GLOBALS['debug_rrule'] ) {
+      printf( "Constructing RRULE based on: '%s', rrule: '%s'\n", $basedate, $rrule );
+    }
+
     if ( preg_match('{FREQ=([A-Z]+)(;|$)}', $rrule, $m) ) $this->freq = $m[1];
     if ( preg_match('{UNTIL=([0-9TZ]+)(;|$)}', $rrule, $m) ) $this->until = new RepeatRuleDateTime($m[1]);
     if ( preg_match('{COUNT=([0-9]+)(;|$)}', $rrule, $m) ) $this->count = $m[1];
@@ -290,7 +294,7 @@ class RepeatRule {
     if ( !$this->valid() ) return null;
     if ( !isset($this->instances[$this->position]) ) $this->GetMoreInstances();
     if ( !$this->valid() ) return null;
-    if ( $GLOBALS['debug_rrule'] ) printf( "Returning date from position %d: %s\n", $this->position, $this->instances[$this->position]->format('c') );
+    if ( $GLOBALS['debug_rrule'] ) printf( "Returning date from position %d: %s (%s)\n", $this->position, $this->instances[$this->position]->format('c'), $this->instances[$this->position]->UTC() );
     return $this->instances[$this->position];
   }
 
@@ -570,7 +574,7 @@ class RepeatRule {
     $this->current_set = array();
     foreach( $instances AS $k => $instance ) {
       foreach( $this->{$element_name} AS $k => $element_value ) {
-        if ( $GLOBALS['debug_rrule'] ) printf( "Limiting '$fmt_char' on '%s' => '%s' ?=? '%s' \n", $instance->format('c'), $instance->format($fmt_char), $element_value );
+        if ( $GLOBALS['debug_rrule'] ) printf( "Limiting '$fmt_char' on '%s' => '%s' ?=? '%s' ? %s\n", $instance->format('c'), $instance->format($fmt_char), $element_value, ($instance->format($fmt_char) == $element_value ? 'Yes' : 'No') );
         if ( $instance->format($fmt_char) == $element_value ) $this->current_set[] = $instance;
       }
     }
@@ -585,7 +589,7 @@ class RepeatRule {
     foreach( $this->byday AS $k => $weekday ) {
       $dow = $rrule_day_numbers[$weekday];
       foreach( $instances AS $k => $instance ) {
-        if ( $GLOBALS['debug_rrule'] ) printf( "Limiting '$fmt_char' on '%s' => '%s' ?=? '%s' (%d) \n", $instance->format('c'), $instance->format($fmt_char), $weekday, $dow );
+        if ( $GLOBALS['debug_rrule'] ) printf( "Limiting '$fmt_char' on '%s' => '%s' ?=? '%s' (%d) ? %s\n", $instance->format('c'), $instance->format($fmt_char), $weekday, $dow, ($instance->format($fmt_char) == $dow ? 'Yes' : 'No') );
         if ( $instance->format($fmt_char) == $dow ) $this->current_set[] = $instance;
       }
     }
diff --git a/testing/tests/regression-suite/959-REPORT-public-expanded.result b/testing/tests/regression-suite/959-REPORT-public-expanded.result
index 814bf078..2dc1d763 100644
--- a/testing/tests/regression-suite/959-REPORT-public-expanded.result
+++ b/testing/tests/regression-suite/959-REPORT-public-expanded.result
@@ -1,14 +1,14 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, calendar-access
-ETag: "d6a4c6b19dbb46bd1e3bf4fce8709319"
-Content-Length: 13238
+DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
+ETag: "d66d743589809941070c38c5f23370b7"
+Content-Length: 9778
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
-  <href>/public.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
+  <href>/caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
     <C:calendar-data>BEGIN:VCALENDAR
@@ -23,7 +23,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081021T000000Z
+DTSTART:20081102T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -34,384 +34,241 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081022T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081023T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081024T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081025T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081028T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081029T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081030T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081031T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081101T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081104T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081105T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081106T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081107T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081108T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081111T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081112T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081113T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081114T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081115T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081118T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081119T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081120T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081121T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081122T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081125T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081126T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081127T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081128T000000Z
-DURATION:PT30M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054958Z
-LAST-MODIFIED:20081023T055044Z
-DTSTAMP:20081023T054958Z
-UID:33169d69-2969-4a96-a3e1-2e312b7614e6
-SUMMARY:Daily Action Meeting
-RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-X-MOZ-GENERATION:2
-DTSTART:20081129T000000Z
-DURATION:PT30M
-END:VEVENT
-END:VCALENDAR
-</C:calendar-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/public.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
-  <propstat>
-   <prop>
-    <C:calendar-data>BEGIN:VCALENDAR
-PRODID:-//davical.org//NONSGML AWL Calendar//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-CREATED:20081023T054934Z
-LAST-MODIFIED:20081023T055059Z
-DTSTAMP:20081023T054934Z
-UID:047871e3-6b70-4178-9af8-0ceb50f7b092
-SUMMARY:Weekly Project Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1
-X-MOZ-GENERATION:2
-DTSTART:20081020T220000Z
-DURATION:PT60M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054934Z
-LAST-MODIFIED:20081023T055059Z
-DTSTAMP:20081023T054934Z
-UID:047871e3-6b70-4178-9af8-0ceb50f7b092
-SUMMARY:Weekly Project Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1
-X-MOZ-GENERATION:2
-DTSTART:20081027T220000Z
-DURATION:PT60M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T054934Z
-LAST-MODIFIED:20081023T055059Z
-DTSTAMP:20081023T054934Z
-UID:047871e3-6b70-4178-9af8-0ceb50f7b092
-SUMMARY:Weekly Project Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1
-X-MOZ-GENERATION:2
 DTSTART:20081103T220000Z
-DURATION:PT60M
+DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20081023T054934Z
-LAST-MODIFIED:20081023T055059Z
-DTSTAMP:20081023T054934Z
-UID:047871e3-6b70-4178-9af8-0ceb50f7b092
-SUMMARY:Weekly Project Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081104T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081105T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081106T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081109T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
 DTSTART:20081110T220000Z
-DURATION:PT60M
+DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20081023T054934Z
-LAST-MODIFIED:20081023T055059Z
-DTSTAMP:20081023T054934Z
-UID:047871e3-6b70-4178-9af8-0ceb50f7b092
-SUMMARY:Weekly Project Meeting
-RRULE:FREQ=WEEKLY;INTERVAL=1
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081111T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081112T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081113T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081116T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
 DTSTART:20081117T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081118T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081119T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081120T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081123T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081124T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081125T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081126T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081127T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081130T220000Z
+DURATION:PT30M
+END:VEVENT
+END:VCALENDAR
+</C:calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
+  <propstat>
+   <prop>
+    <C:calendar-data>BEGIN:VCALENDAR
+PRODID:-//davical.org//NONSGML AWL Calendar//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+CREATED:20081023T054934Z
+LAST-MODIFIED:20081023T055059Z
+DTSTAMP:20081023T054934Z
+UID:047871e3-6b70-4178-9af8-0ceb50f7b092
+SUMMARY:Weekly Project Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1
+X-MOZ-GENERATION:2
+DTSTART:20081102T200000Z
 DURATION:PT60M
 END:VEVENT
 BEGIN:VEVENT
@@ -422,7 +279,40 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
 SUMMARY:Weekly Project Meeting
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081124T220000Z
+DTSTART:20081109T200000Z
+DURATION:PT60M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054934Z
+LAST-MODIFIED:20081023T055059Z
+DTSTAMP:20081023T054934Z
+UID:047871e3-6b70-4178-9af8-0ceb50f7b092
+SUMMARY:Weekly Project Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1
+X-MOZ-GENERATION:2
+DTSTART:20081116T200000Z
+DURATION:PT60M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054934Z
+LAST-MODIFIED:20081023T055059Z
+DTSTAMP:20081023T054934Z
+UID:047871e3-6b70-4178-9af8-0ceb50f7b092
+SUMMARY:Weekly Project Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1
+X-MOZ-GENERATION:2
+DTSTART:20081123T200000Z
+DURATION:PT60M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054934Z
+LAST-MODIFIED:20081023T055059Z
+DTSTAMP:20081023T054934Z
+UID:047871e3-6b70-4178-9af8-0ceb50f7b092
+SUMMARY:Weekly Project Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1
+X-MOZ-GENERATION:2
+DTSTART:20081130T200000Z
 DURATION:PT60M
 END:VEVENT
 END:VCALENDAR
@@ -432,7 +322,7 @@ END:VCALENDAR
   </propstat>
  </response>
  <response>
-  <href>/public.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
+  <href>/caldav.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
   <propstat>
    <prop>
     <C:calendar-data>BEGIN:VCALENDAR
@@ -447,7 +337,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
 SUMMARY:Weekly catch-up
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081025T030000Z
+DTSTART:20081107T010000Z
 DURATION:PT60M
 END:VEVENT
 BEGIN:VEVENT
@@ -458,7 +348,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
 SUMMARY:Weekly catch-up
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081101T030000Z
+DTSTART:20081114T010000Z
 DURATION:PT60M
 END:VEVENT
 BEGIN:VEVENT
@@ -469,7 +359,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
 SUMMARY:Weekly catch-up
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081108T030000Z
+DTSTART:20081121T010000Z
 DURATION:PT60M
 END:VEVENT
 BEGIN:VEVENT
@@ -480,29 +370,7 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
 SUMMARY:Weekly catch-up
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081115T030000Z
-DURATION:PT60M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T055115Z
-LAST-MODIFIED:20081023T055139Z
-DTSTAMP:20081023T055115Z
-UID:9429a973-2b13-4b1a-be09-948d75425c45
-SUMMARY:Weekly catch-up
-RRULE:FREQ=WEEKLY;INTERVAL=1
-X-MOZ-GENERATION:2
-DTSTART:20081122T030000Z
-DURATION:PT60M
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T055115Z
-LAST-MODIFIED:20081023T055139Z
-DTSTAMP:20081023T055115Z
-UID:9429a973-2b13-4b1a-be09-948d75425c45
-SUMMARY:Weekly catch-up
-RRULE:FREQ=WEEKLY;INTERVAL=1
-X-MOZ-GENERATION:2
-DTSTART:20081129T030000Z
+DTSTART:20081128T010000Z
 DURATION:PT60M
 END:VEVENT
 END:VCALENDAR
@@ -512,3 +380,19 @@ END:VCALENDAR
   </propstat>
  </response>
 </multistatus>
+
+         dav_name: >/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics<
+          dtstart: >2008-10-20 11:00:00+13<
+      dtstart_utc: >2008-10-19 22:00:00<
+            rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR<
+
+         dav_name: >/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics<
+          dtstart: >2008-10-20 09:00:00+13<
+      dtstart_utc: >2008-10-19 20:00:00<
+            rrule: >FREQ=WEEKLY;INTERVAL=1<
+
+         dav_name: >/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics<
+          dtstart: >2008-10-24 14:00:00+13<
+      dtstart_utc: >2008-10-24 01:00:00<
+            rrule: >FREQ=WEEKLY;INTERVAL=1<
+
diff --git a/testing/tests/regression-suite/959-REPORT-public-expanded.test b/testing/tests/regression-suite/959-REPORT-public-expanded.test
index 9016e61e..ef3ebce6 100644
--- a/testing/tests/regression-suite/959-REPORT-public-expanded.test
+++ b/testing/tests/regression-suite/959-REPORT-public-expanded.test
@@ -2,19 +2,12 @@
 # Test REPORT access to a non-public calendar using a ticket.
 #
 TYPE=REPORT
-URL=http://regression.host/public.php/user2/home/
-NOAUTH
+URL=http://regression.host/caldav.php/user2/home/
+AUTH=user2:user2
 
 
-# Get the ticket we created earlier in 948...
-GETSQL=ticket
-SELECT ticket_id FROM access_ticket
-                WHERE target_collection_id = 11 AND target_resource_id is null;
-ENDSQL
-
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml; charset="UTF-8"
-HEADER=Ticket: ##ticket##
 HEAD
 
 
@@ -23,16 +16,27 @@ BEGINDATA
 <calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
   <D:prop>
     <calendar-data>
-      <expand start="20081001T000000Z" end="20081201T000000Z"/>
+      <expand start="20081101T000000Z" end="20081201T000000Z"/>
     </calendar-data>
   </D:prop>
   <filter>
     <comp-filter name="VCALENDAR">
       <comp-filter name="VEVENT">
-        <time-range start="20081001T000000Z" end="20081201T000000Z"/>
+        <time-range start="20081101T000000Z" end="20081201T000000Z"/>
       </comp-filter>
     </comp-filter>
   </filter>
 </calendar-query>
 ENDDATA
 
+
+QUERY
+SELECT dav_name,
+       dtstart, dtstart AT TIME ZONE 'UTC' AS dtstart_utc,
+       rrule
+  FROM calendar_item
+ WHERE dav_name ~ '^/user2/home/'
+   AND rrule IS NOT NULL
+   AND dtstart < '20081201T000000Z'
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/961-REPORT-public-expanded.result b/testing/tests/regression-suite/961-REPORT-public-expanded.result
index 675408d6..d604c537 100644
--- a/testing/tests/regression-suite/961-REPORT-public-expanded.result
+++ b/testing/tests/regression-suite/961-REPORT-public-expanded.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, calendar-access
-ETag: "857dcd8807d6eb47dcf05072458e4cce"
-Content-Length: 9284
+ETag: "76609547b1a059d8ad4f3657485c5fe1"
+Content-Length: 9578
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -23,7 +23,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081021T000000Z
+DTSTART:20081019T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -34,7 +34,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081022T000000Z
+DTSTART:20081020T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -45,7 +45,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081023T000000Z
+DTSTART:20081021T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -56,7 +56,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081024T000000Z
+DTSTART:20081022T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -67,7 +67,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081025T000000Z
+DTSTART:20081023T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -78,7 +78,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081028T000000Z
+DTSTART:20081026T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -89,7 +89,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081029T000000Z
+DTSTART:20081027T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -100,7 +100,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081030T000000Z
+DTSTART:20081028T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -111,7 +111,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081031T000000Z
+DTSTART:20081029T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -122,7 +122,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081101T000000Z
+DTSTART:20081030T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -133,7 +133,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081104T000000Z
+DTSTART:20081102T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -144,7 +144,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081105T000000Z
+DTSTART:20081103T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -155,7 +155,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081106T000000Z
+DTSTART:20081104T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -166,7 +166,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081107T000000Z
+DTSTART:20081105T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -177,7 +177,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081108T000000Z
+DTSTART:20081106T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -188,7 +188,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081111T000000Z
+DTSTART:20081109T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -199,7 +199,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081112T000000Z
+DTSTART:20081110T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -210,7 +210,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081113T000000Z
+DTSTART:20081111T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -221,7 +221,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081114T000000Z
+DTSTART:20081112T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -232,7 +232,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081115T000000Z
+DTSTART:20081113T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -243,7 +243,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081118T000000Z
+DTSTART:20081116T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -254,7 +254,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081119T000000Z
+DTSTART:20081117T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -265,7 +265,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081120T000000Z
+DTSTART:20081118T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -276,7 +276,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081121T000000Z
+DTSTART:20081119T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -287,7 +287,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081122T000000Z
+DTSTART:20081120T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -298,7 +298,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081125T000000Z
+DTSTART:20081123T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -309,7 +309,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081126T000000Z
+DTSTART:20081124T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -320,7 +320,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081127T000000Z
+DTSTART:20081125T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -331,7 +331,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081128T000000Z
+DTSTART:20081126T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -342,7 +342,18 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081129T000000Z
+DTSTART:20081127T220000Z
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T054958Z
+LAST-MODIFIED:20081023T055044Z
+DTSTAMP:20081023T054958Z
+UID:33169d69-2969-4a96-a3e1-2e312b7614e6
+SUMMARY:Daily Action Meeting
+RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
+X-MOZ-GENERATION:2
+DTSTART:20081130T220000Z
 DURATION:PT30M
 END:VEVENT
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/969-REPORT-bound.result b/testing/tests/regression-suite/969-REPORT-bound.result
index 23fce2e9..933b2a45 100644
--- a/testing/tests/regression-suite/969-REPORT-bound.result
+++ b/testing/tests/regression-suite/969-REPORT-bound.result
@@ -16,7 +16,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081021T000000Z
+DTSTART:20081019T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -27,7 +27,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081022T000000Z
+DTSTART:20081020T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -38,7 +38,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081023T000000Z
+DTSTART:20081021T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -49,7 +49,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081024T000000Z
+DTSTART:20081022T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -60,7 +60,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081025T000000Z
+DTSTART:20081023T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -71,7 +71,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081028T000000Z
+DTSTART:20081026T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -82,7 +82,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081029T000000Z
+DTSTART:20081027T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -93,7 +93,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081030T000000Z
+DTSTART:20081028T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -104,7 +104,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081031T000000Z
+DTSTART:20081029T220000Z
 DURATION:PT30M
 END:VEVENT
 BEGIN:VEVENT
@@ -115,7 +115,7 @@ UID:33169d69-2969-4a96-a3e1-2e312b7614e6
 SUMMARY:Daily Action Meeting
 RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
 X-MOZ-GENERATION:2
-DTSTART:20081101T000000Z
+DTSTART:20081030T220000Z
 DURATION:PT30M
 END:VEVENT
 END:VCALENDAR
@@ -140,7 +140,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
 SUMMARY:Weekly Project Meeting
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081020T220000Z
+DTSTART:20081019T200000Z
 DURATION:PT60M
 END:VEVENT
 BEGIN:VEVENT
@@ -151,7 +151,7 @@ UID:047871e3-6b70-4178-9af8-0ceb50f7b092
 SUMMARY:Weekly Project Meeting
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081027T220000Z
+DTSTART:20081026T200000Z
 DURATION:PT60M
 END:VEVENT
 END:VCALENDAR
@@ -176,7 +176,18 @@ UID:9429a973-2b13-4b1a-be09-948d75425c45
 SUMMARY:Weekly catch-up
 RRULE:FREQ=WEEKLY;INTERVAL=1
 X-MOZ-GENERATION:2
-DTSTART:20081025T030000Z
+DTSTART:20081024T010000Z
+DURATION:PT60M
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20081023T055115Z
+LAST-MODIFIED:20081023T055139Z
+DTSTAMP:20081023T055115Z
+UID:9429a973-2b13-4b1a-be09-948d75425c45
+SUMMARY:Weekly catch-up
+RRULE:FREQ=WEEKLY;INTERVAL=1
+X-MOZ-GENERATION:2
+DTSTART:20081031T010000Z
 DURATION:PT60M
 END:VEVENT
 END:VCALENDAR