diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
index 1135ec42..4887d259 100644
--- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "9e402a9adb641a6ce4891a105f7963bd"
-Content-Length: 17404
+ETag: "760ca652c9842246f594738b3c8d03b9"
+Content-Length: 17602
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -92,6 +92,8 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VJOURNAL"/>
      <C1:comp name="VTIMEZONE"/>
      <C1:comp name="VFREEBUSY"/>
+     <C1:comp name="VPOLL"/>
+     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -245,6 +247,8 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VJOURNAL"/>
      <C1:comp name="VTIMEZONE"/>
      <C1:comp name="VFREEBUSY"/>
+     <C1:comp name="VPOLL"/>
+     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -503,6 +507,8 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VJOURNAL"/>
      <C1:comp name="VTIMEZONE"/>
      <C1:comp name="VFREEBUSY"/>
+     <C1:comp name="VPOLL"/>
+     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
index 5850e03c..02e43fda 100644
--- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "f979bd69bf442e8e93634acdea5bb42b"
-Content-Length: 1457
+ETag: "40ca69213ba0a2d6145fb4e99205081f"
+Content-Length: 1521
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -21,6 +21,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <C:schedule-default-calendar-URL>
      <href>/user1/home/</href>
diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
index a5f4e551..92726cc2 100644
--- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "4f2f5fe4966246175dfc7a90396422d2"
-Content-Length: 12754
+ETag: "6ef0b9c58af6fb12800d0ebd056e0e85"
+Content-Length: 12946
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -78,6 +78,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -200,6 +202,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -413,6 +417,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
index a5f4e551..92726cc2 100644
--- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "4f2f5fe4966246175dfc7a90396422d2"
-Content-Length: 12754
+ETag: "6ef0b9c58af6fb12800d0ebd056e0e85"
+Content-Length: 12946
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -78,6 +78,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -200,6 +202,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -413,6 +417,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
index cd0d2ddb..27ca2607 100644
--- a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "4b62114cda76b7d0b7e18ee55488af71"
-Content-Length: 4741
+ETag: "23d5188e972ee46de551b1dd2cf1073a"
+Content-Length: 4933
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -38,6 +38,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -77,6 +79,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -133,6 +137,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
index 9c1b6065..85c654d6 100644
--- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "9750b11e4998e1538b7bb3626ae19b39"
-Content-Length: 2156
+ETag: "6991cc83557b9ab4224fafebcb6e8565"
+Content-Length: 2220
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -76,6 +76,8 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VJOURNAL"/>
      <C:comp name="VTIMEZONE"/>
      <C:comp name="VFREEBUSY"/>
+     <C:comp name="VPOLL"/>
+     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <C:supported-calendar-data>text/calendar</C:supported-calendar-data>
    </prop>