diff --git a/testing/tests/regression-suite/237-Moz-REPORT.result b/testing/tests/regression-suite/237-Moz-REPORT.result
index 1973dc82..86ab2fa7 100644
--- a/testing/tests/regression-suite/237-Moz-REPORT.result
+++ b/testing/tests/regression-suite/237-Moz-REPORT.result
@@ -8,7 +8,7 @@
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
index 340e1d06..72dbb0ca 100644
--- a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
+++ b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.result
@@ -1,8 +1,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
-ETag: "0df5049284c13eae94d8f8ddc52d521b"
-Content-Length: 739
+ETag: "597efa7e88a1a1b92b2e4992c06dec37"
+Content-Length: 743
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/davical/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/davical/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/240-Moz-PROPFIND.result b/testing/tests/regression-suite/240-Moz-PROPFIND.result
index d1efa50b..696db281 100644
--- a/testing/tests/regression-suite/240-Moz-PROPFIND.result
+++ b/testing/tests/regression-suite/240-Moz-PROPFIND.result
@@ -1,8 +1,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
-ETag: "9b84304066ad932fa860037c4905711a"
-Content-Length: 699
+ETag: "ae38bedeae4ae0a4098c7b48fd69deec"
+Content-Length: 703
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index 512a746f..8e113772 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -1,8 +1,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
-ETag: "b0f0e90505257a98010cd129bee559bc"
-Content-Length: 590
+ETag: "d9bed0f97ea7fc603a204227a589a5fd"
+Content-Length: 1198
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -22,6 +22,39 @@ Content-Type: text/xml; charset="utf-8"
      <privilege>
       <all/>
      </privilege>
+     <privilege>
+      <C:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
     </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/501-iCal-PROPFIND.result b/testing/tests/regression-suite/501-iCal-PROPFIND.result
index a9b69033..e901498c 100644
--- a/testing/tests/regression-suite/501-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/501-iCal-PROPFIND.result
@@ -1,12 +1,12 @@
 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
-ETag: "84248a83d10735003afd060f33219444"
-Content-Length: 924
+ETag: "5ed08314fb5ad0e07c85d57eb71be31b"
+Content-Length: 973
 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" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
@@ -25,15 +25,14 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <displayname>User 1</displayname>
+    <A:dropbox-home-URL>
+     <href>/caldav.php/user1/.drop/</href>
+    </A:dropbox-home-URL>
+    <A:notifications-URL>
+     <href>/caldav.php/user1/.notify/</href>
+    </A:notifications-URL>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/510-iCal-PROPFIND.result b/testing/tests/regression-suite/510-iCal-PROPFIND.result
index 55eade7d..7f2ad6f4 100644
--- a/testing/tests/regression-suite/510-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/510-iCal-PROPFIND.result
@@ -1,8 +1,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
-ETag: "2a9abfc44969a1ca9913a13bc2008f1b"
-Content-Length: 933
+ETag: "8d5cadaff927bedecef893cc26763bdc"
+Content-Length: 937
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/511-iCal-PROPFIND.result b/testing/tests/regression-suite/511-iCal-PROPFIND.result
index 6ef1a548..6215a4fe 100644
--- a/testing/tests/regression-suite/511-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/511-iCal-PROPFIND.result
@@ -1,8 +1,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
-ETag: "6a5ca17c5e140b8e593cf5fd51a10003"
-Content-Length: 922
+ETag: "37f4b022746b844ddd617319bd5e7d56"
+Content-Length: 926
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -22,7 +22,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index d4e0589d..8428a6c8 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-PROPFIND.result
@@ -1,17 +1,16 @@
 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
-ETag: "d4bcb58c32706d332ffd4234c2280d89"
-Content-Length: 3560
+ETag: "91a8cf2fbee879465adb012a3716f2a6"
+Content-Length: 3520
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A1="http://apple.com/ns/ical/">
+<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apple.com/ns/ical/">
  <response>
   <href>/caldav.php/user2/</href>
   <propstat>
    <prop>
-    <A:getctag>"f3a754d098fc688900631c6293d40fa5"</A:getctag>
     <displayname>User 2</displayname>
     <resourcetype>
      <principal/>
@@ -22,10 +21,11 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C:getctag/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -36,20 +36,20 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:calendar/>
-     <C:schedule-calendar/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>user2 home</displayname>
-    <A:getctag>"876883ebf6e5e80fb501f490c70803b5"</A:getctag>
+    <C:getctag>"876883ebf6e5e80fb501f490c70803b5"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -60,21 +60,21 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:schedule-inbox/>
+     <C1:schedule-inbox/>
     </resourcetype>
     <displayname>User 2 Inbox</displayname>
-    <A:getctag>""</A:getctag>
-    <C:calendar-free-busy-set>
+    <C:getctag>""</C:getctag>
+    <C1:calendar-free-busy-set>
      <href>/caldav.php/user2/home/</href>
-    </C:calendar-free-busy-set>
+    </C1:calendar-free-busy-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -85,19 +85,19 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:schedule-outbox/>
+     <C1:schedule-outbox/>
     </resourcetype>
     <displayname>User 2 Outbox</displayname>
-    <A:getctag>""</A:getctag>
+    <C:getctag>""</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -109,19 +109,19 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-read/>
+     <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/user2/calendar-proxy-read/</displayname>
-    <A:getctag>"19a2e9eecca4a20bb93c23c0ab653d77"</A:getctag>
+    <C:getctag>"19a2e9eecca4a20bb93c23c0ab653d77"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -133,19 +133,19 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-write/>
+     <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/user2/calendar-proxy-write/</displayname>
-    <A:getctag>"f9ade6a8d81cbc6a7a7b932981955bb4"</A:getctag>
+    <C:getctag>"f9ade6a8d81cbc6a7a7b932981955bb4"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
diff --git a/testing/tests/regression-suite/523-iCal-PROPFIND.result b/testing/tests/regression-suite/523-iCal-PROPFIND.result
index 3d60fa1a..d3a401c4 100644
--- a/testing/tests/regression-suite/523-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/523-iCal-PROPFIND.result
@@ -2,12 +2,12 @@ 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
 Content-Location: /caldav.php/user2/
-ETag: "0854d21be0b64c46991001904f788ffe"
-Content-Length: 924
+ETag: "3d87b8794e2cae8ab98077c4b2b1ca40"
+Content-Length: 973
 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" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user2/</href>
   <propstat>
@@ -16,7 +16,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user2/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user2@example.net</href>
+     <href>mailto%3Auser2%40example.net</href>
      <href>/caldav.php/user2/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
@@ -26,15 +26,14 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user2/.out/</href>
     </C:schedule-outbox-URL>
     <displayname>User 2</displayname>
+    <A:dropbox-home-URL>
+     <href>/caldav.php/user2/.drop/</href>
+    </A:dropbox-home-URL>
+    <A:notifications-URL>
+     <href>/caldav.php/user2/.notify/</href>
+    </A:notifications-URL>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/524-iCal-PROPFIND.result b/testing/tests/regression-suite/524-iCal-PROPFIND.result
index df57f440..b717b2e2 100644
--- a/testing/tests/regression-suite/524-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/524-iCal-PROPFIND.result
@@ -1,17 +1,16 @@
 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
-ETag: "0b389661ad23c1fac7a9bb91b9fbc49a"
-Content-Length: 3553
+ETag: "432aa6b31d8dbe82651aef6bac55ea55"
+Content-Length: 3515
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/manager1/</href>
   <propstat>
    <prop>
-    <A:getctag>"ab4a67c917e242e0989cd278c75a510e"</A:getctag>
     <displayname>Manager 1</displayname>
     <resourcetype>
      <principal/>
@@ -28,9 +27,10 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
-    <A:calendar-proxy-read-for/>
-    <A:calendar-proxy-write-for/>
-    <C:calendar-description/>
+    <C:getctag/>
+    <C:calendar-proxy-read-for/>
+    <C:calendar-proxy-write-for/>
+    <C1:calendar-description/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -41,11 +41,11 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:calendar/>
-     <C:schedule-calendar/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>manager1 home</displayname>
-    <A:getctag>"c240642ddef994358c96da82c0361a58"</A:getctag>
+    <C:getctag>"c240642ddef994358c96da82c0361a58"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -53,9 +53,9 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <group-member-set/>
     <group-membership/>
-    <A:calendar-proxy-read-for/>
-    <A:calendar-proxy-write-for/>
-    <C:calendar-description/>
+    <C:calendar-proxy-read-for/>
+    <C:calendar-proxy-write-for/>
+    <C1:calendar-description/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -67,12 +67,12 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-read/>
+     <C:calendar-proxy-read/>
     </resourcetype>
-    <A:calendar-proxy-read-for>
+    <C:calendar-proxy-read-for>
      <href>/caldav.php/user1/</href>
      <href>/caldav.php/assistant1/</href>
-    </A:calendar-proxy-read-for>
+    </C:calendar-proxy-read-for>
     <group-member-set>
      <href>/caldav.php/user1/</href>
     </group-member-set>
@@ -82,7 +82,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/assistant1/calendar-proxy-read/</href>
     </group-membership>
     <displayname>/manager1/calendar-proxy-read/</displayname>
-    <A:getctag>"d6996992ae401eb02ed8fed0bfb22895"</A:getctag>
+    <C:getctag>"d6996992ae401eb02ed8fed0bfb22895"</C:getctag>
     <group-member-set>
      <href>/caldav.php/user1/</href>
     </group-member-set>
@@ -91,8 +91,8 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
-    <A:calendar-proxy-write-for/>
-    <C:calendar-description/>
+    <C:calendar-proxy-write-for/>
+    <C1:calendar-description/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -104,9 +104,9 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-write/>
+     <C:calendar-proxy-write/>
     </resourcetype>
-    <A:calendar-proxy-write-for/>
+    <C:calendar-proxy-write-for/>
     <group-member-set>
      <href>/caldav.php/assistant1/</href>
     </group-member-set>
@@ -116,7 +116,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/assistant1/calendar-proxy-read/</href>
     </group-membership>
     <displayname>/manager1/calendar-proxy-write/</displayname>
-    <A:getctag>"9849062cdad5f238a4ac4a9829bcdbcf"</A:getctag>
+    <C:getctag>"9849062cdad5f238a4ac4a9829bcdbcf"</C:getctag>
     <group-member-set>
      <href>/caldav.php/assistant1/</href>
     </group-member-set>
@@ -125,8 +125,8 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
-    <A:calendar-proxy-read-for/>
-    <C:calendar-description/>
+    <C:calendar-proxy-read-for/>
+    <C1:calendar-description/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
diff --git a/testing/tests/regression-suite/552-iPhone-PROPFIND.result b/testing/tests/regression-suite/552-iPhone-PROPFIND.result
index 4b97c6d8..4b635c59 100644
--- a/testing/tests/regression-suite/552-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/552-iPhone-PROPFIND.result
@@ -1,12 +1,12 @@
 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
-ETag: "35e75c275075534433a2b68f9691ae20"
-Content-Length: 930
+ETag: "c5d6273274dc9ecf811c954f41947619"
+Content-Length: 979
 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" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A="http://calendarserver.org/ns/">
  <response>
   <href>/principals/users/user1/</href>
   <propstat>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
     <C:schedule-inbox-URL>
@@ -25,15 +25,14 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
     <displayname>User 1</displayname>
+    <A:dropbox-home-URL>
+     <href>/caldav.php/user1/.drop/</href>
+    </A:dropbox-home-URL>
+    <A:notifications-URL>
+     <href>/caldav.php/user1/.notify/</href>
+    </A:notifications-URL>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.result b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
index d9fb11d5..33f780b4 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
@@ -1,38 +1,12 @@
 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
-ETag: "6fce1097fe68f06e745b40b2067552c9"
-Content-Length: 3027
+ETag: "d0eafee2ab4fcc3c0368447335612cd4"
+Transfer-Encoding: chunked
 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" xmlns:A="http://apple.com/ns/ical/">
- <response>
-  <href>/</href>
-  <propstat>
-   <prop>
-    <C:supported-calendar-component-set>
-     <C:comp name="VEVENT"/>
-     <C:comp name="VTODO"/>
-     <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-    </C:supported-calendar-component-set>
-    <resourcetype>
-     <collection/>
-    </resourcetype>
-    <displayname>DAViCal CalDAV Server</displayname>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <A:calendar-color/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
+<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apple.com/ns/ical/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -42,97 +16,519 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set/>
-    <C:calendar-description/>
+    <C:getctag/>
+    <C1:supported-calendar-component-set/>
+    <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/manager1/</href>
+  <href>/caldav.php/user1/home/</href>
   <propstat>
    <prop>
-    <displayname>Manager 1</displayname>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
     <resourcetype>
-     <principal/>
      <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
+    <displayname>user1 home</displayname>
+    <C:getctag>"9a28f344c1e0032e5967806f193a7cb7"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set/>
-    <C:calendar-description/>
+    <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/assistant1/</href>
+  <href>/caldav.php/user1/created/</href>
   <propstat>
    <prop>
-    <displayname>Assistant 1</displayname>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
     <resourcetype>
-     <principal/>
      <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
+    <displayname>created</displayname>
+    <C:getctag>"bac273dae96780a3c8ed0c032266322c"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set/>
-    <C:calendar-description/>
+    <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/resource1/</href>
+  <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
-    <displayname>Resource 1</displayname>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
     <resourcetype>
-     <principal/>
      <collection/>
+     <C1:schedule-inbox/>
     </resourcetype>
+    <displayname>User 1 Inbox</displayname>
+    <C:getctag>""</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set/>
-    <C:calendar-description/>
+    <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/resource2/</href>
+  <href>/caldav.php/user1/.out/</href>
   <propstat>
    <prop>
-    <displayname>Resource 2</displayname>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
     <resourcetype>
-     <principal/>
      <collection/>
+     <C1:schedule-outbox/>
     </resourcetype>
+    <displayname>User 1 Outbox</displayname>
+    <C:getctag>""</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:supported-calendar-component-set/>
-    <C:calendar-description/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
+  <propstat>
+   <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
+    </resourcetype>
+    <displayname>iCal Calendar</displayname>
+    <C:getctag>"ac192d10783fff90598af2facc8259df"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
+    <A:calendar-color>#391B71A0</A:calendar-color>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C1:calendar-description/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-read/</href>
+  <propstat>
+   <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C:calendar-proxy-read/>
+    </resourcetype>
+    <displayname>/user1/calendar-proxy-read/</displayname>
+    <C:getctag>"3646538a5bdbcc9a144ee36f36000214"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/calendar-proxy-write/</href>
+  <propstat>
+   <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C:calendar-proxy-write/>
+    </resourcetype>
+    <displayname>/user1/calendar-proxy-write/</displayname>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <C1:calendar-description/>
     <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.test b/testing/tests/regression-suite/553-iPhone-PROPFIND.test
index ce38e4fb..d12e2cbb 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/553-iPhone-PROPFIND.test
@@ -1,8 +1,8 @@
 #
-# Testing with a process similar to iPhone 3
+# Testing with a process similar to iPhone 3.1
 #
 TYPE=PROPFIND
-URL=http://mycaldav/
+URL=http://mycaldav/caldav.php/user1/
 HEAD
 
 AUTH=user1:user1
@@ -12,20 +12,20 @@ HEADER=Content-Type: text/xml
 HEADER=Depth: 1
 
 #
-# This query from the iPhone seems to discover several things.  Firstly they
-# get the calendar-home-set URL for this path.  Secondly, they ascertain
-# whether the calendar supports scheduling, and finally, whether it
-# handles some Apple-specific extensions.
+# This query from the iPhone goes to the calendar-home-set and checks
+# what is available under that collection.
 #
 BEGINDATA
 <?xml version="1.0" encoding="utf-8"?>
-<x0:propfind xmlns:x1="urn:ietf:params:xml:ns:caldav" xmlns:x0="DAV:" xmlns:x2="http://apple.com/ns/ical/">
+<x0:propfind xmlns:x2="http://calendarserver.org/ns/" xmlns:x0="DAV:" xmlns:x3="http://apple.com/ns/ical/" xmlns:x1="urn:ietf:params:xml:ns:caldav">
  <x0:prop>
   <x0:displayname/>
   <x1:calendar-description/>
+  <x2:getctag/>
+  <x3:calendar-color/>
   <x1:supported-calendar-component-set/>
-  <x2:calendar-color/>
   <x0:resourcetype/>
+  <x0:current-user-privilege-set/>
  </x0:prop>
 </x0:propfind>
 ENDDATA
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.result b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
index f7ef4736..33f780b4 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
@@ -1,37 +1,68 @@
 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
-ETag: "f31ea9144fd675f7b545ea397f934031"
+ETag: "d0eafee2ab4fcc3c0368447335612cd4"
 Transfer-Encoding: chunked
 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" xmlns:C1="http://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apple.com/ns/ical/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
    <prop>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
     <displayname>User 1</displayname>
+    <resourcetype>
+     <principal/>
+     <collection/>
+    </resourcetype>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C:getctag/>
+    <C1:supported-calendar-component-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -40,462 +71,65 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
+    </resourcetype>
     <displayname>user1 home</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>"9a28f344c1e0032e5967806f193a7cb7"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Due 7/8/7 16:30, completed</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Private Event</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <displayname>A Meeting</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Incomplete, uncancelled</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Lunch with David</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Weekly Project Meeting</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Beer O'Clock</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
-  <propstat>
-   <prop>
-    <displayname>50% Complete, uncancelled</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Confidential Event</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
-  <propstat>
-   <prop>
-    <displayname>BBQ @ ML's</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
-  <propstat>
-   <prop>
-    <displayname>A Cancelled Task, with a start and due date</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Morning Mgmt Mtg</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Release 0.9.3</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Morning Meeting</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Tentative Event</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -504,27 +138,65 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/created/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
+    </resourcetype>
     <displayname>created</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>"bac273dae96780a3c8ed0c032266322c"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -533,27 +205,64 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:schedule-inbox/>
+    </resourcetype>
     <displayname>User 1 Inbox</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>""</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -562,27 +271,64 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.out/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:schedule-outbox/>
+    </resourcetype>
     <displayname>User 1 Outbox</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>""</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -591,85 +337,65 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
+    </resourcetype>
     <displayname>iCal Calendar</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>"ac192d10783fff90598af2facc8259df"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
+    <A:calendar-color>#391B71A0</A:calendar-color>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Go to work</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
-  <propstat>
-   <prop>
-    <displayname>Celebrate a significant birthday</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
-  <propstat>
-   <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -678,27 +404,65 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C:calendar-proxy-read/>
+    </resourcetype>
     <displayname>/user1/calendar-proxy-read/</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>"3646538a5bdbcc9a144ee36f36000214"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -707,27 +471,65 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-write/</href>
   <propstat>
    <prop>
+    <C1:supported-calendar-component-set>
+     <C1:comp name="VEVENT"/>
+     <C1:comp name="VTODO"/>
+     <C1:comp name="VJOURNAL"/>
+     <C1:comp name="VTIMEZONE"/>
+     <C1:comp name="VFREEBUSY"/>
+    </C1:supported-calendar-component-set>
+    <resourcetype>
+     <collection/>
+     <principal/>
+     <C:calendar-proxy-write/>
+    </resourcetype>
     <displayname>/user1/calendar-proxy-write/</displayname>
-    <C:calendar-home-set>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-home-set>
-    <C:schedule-inbox-URL>
-     <href>/caldav.php/user1/.in/</href>
-    </C:schedule-inbox-URL>
-    <C:schedule-outbox-URL>
-     <href>/caldav.php/user1/.out/</href>
-    </C:schedule-outbox-URL>
-    <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
-     <href>/caldav.php/user1/</href>
-    </C:calendar-user-address-set>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
+    <current-user-privilege-set>
+     <privilege>
+      <all/>
+     </privilege>
+     <privilege>
+      <C1:read-free-busy/>
+     </privilege>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <lock/>
+     </privilege>
+     <privilege>
+      <unlock/>
+     </privilege>
+     <privilege>
+      <read-acl/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C1:dropbox-home-URL/>
-    <C1:notifications-URL/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.test b/testing/tests/regression-suite/554-iPhone-PROPFIND.test
index 6a4bcf48..6b8855e0 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/554-iPhone-PROPFIND.test
@@ -9,6 +9,7 @@ AUTH=user1:user1
 
 HEADER=User-Agent: DAVKit/4.0 (728.3); iCalendar/1 (34); iPhone/3.0 7A341
 HEADER=Content-Type: text/xml
+HEADER=Depth: 1
 
 #
 # This query from the iPhone seems to discover several things.  Firstly they
@@ -18,15 +19,15 @@ HEADER=Content-Type: text/xml
 #
 BEGINDATA
 <?xml version="1.0" encoding="utf-8"?>
-<x0:propfind xmlns:x2="http://calendarserver.org/ns/" xmlns:x1="urn:ietf:params:xml:ns:caldav" xmlns:x0="DAV:">
+<x0:propfind xmlns:x2="http://calendarserver.org/ns/" xmlns:x0="DAV:" xmlns:x3="http://apple.com/ns/ical/" xmlns:x1="urn:ietf:params:xml:ns:caldav">
  <x0:prop>
-  <x1:calendar-home-set/>
-  <x1:calendar-user-address-set/>
-  <x1:schedule-inbox-URL/>
-  <x1:schedule-outbox-URL/>
-  <x2:dropbox-home-URL/>
-  <x2:notifications-URL/>
   <x0:displayname/>
+  <x1:calendar-description/>
+  <x2:getctag/>
+  <x3:calendar-color/>
+  <x1:supported-calendar-component-set/>
+  <x0:resourcetype/>
+  <x0:current-user-privilege-set/>
  </x0:prop>
 </x0:propfind>
 ENDDATA
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index e905e10d..8b6117a0 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,7 +1,7 @@
 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
-ETag: "b0c1ee66ec5504e1433bca881c1e0eaf"
+ETag: "47d77c3661bd0c6f5c7b50a4a6c4d59e"
 Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -37,7 +37,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -59,7 +59,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -81,7 +81,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -103,7 +103,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -125,7 +125,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -147,7 +147,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -169,7 +169,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -191,7 +191,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -213,7 +213,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -235,7 +235,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -257,7 +257,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -279,7 +279,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -301,7 +301,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -323,7 +323,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -345,7 +345,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -367,7 +367,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -389,7 +389,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -411,7 +411,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -433,7 +433,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -455,7 +455,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -477,7 +477,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -499,7 +499,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -521,7 +521,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -543,7 +543,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/603-Soho-PROPFIND.result b/testing/tests/regression-suite/603-Soho-PROPFIND.result
index cc96ce36..4661466f 100644
--- a/testing/tests/regression-suite/603-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/603-Soho-PROPFIND.result
@@ -1,8 +1,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
-ETag: "ea92b512c27205b703cb6f52043bb6d3"
-Content-Length: 4476
+ETag: "4ab67c78dc7e5125f42cc92c6b177711"
+Content-Length: 4508
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -37,7 +37,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -59,7 +59,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -81,7 +81,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -103,7 +103,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -125,7 +125,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -147,7 +147,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
@@ -169,7 +169,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/604-Soho-PROPFIND.result b/testing/tests/regression-suite/604-Soho-PROPFIND.result
index 74cad25b..72b49963 100644
--- a/testing/tests/regression-suite/604-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/604-Soho-PROPFIND.result
@@ -1,8 +1,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
-ETag: "600c4b10a558bf4dcaff71d767733dbc"
-Content-Length: 694
+ETag: "9b3ad28580551b6dea6a665dfa82b379"
+Content-Length: 698
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -15,7 +15,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/</href>
     </C:calendar-home-set>
     <C:calendar-user-address-set>
-     <href>mailto:user1@example.net</href>
+     <href>mailto%3Auser1%40example.net</href>
      <href>/caldav.php/user1/</href>
     </C:calendar-user-address-set>
    </prop>
diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
index de2b3c43..a9d2a50e 100644
--- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/827-Spec-PROPFIND.result b/testing/tests/regression-suite/827-Spec-PROPFIND.result
index 01098fa8..4a8c048c 100644
--- a/testing/tests/regression-suite/827-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/827-Spec-PROPFIND.result
@@ -64,7 +64,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -85,6 +84,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
@@ -111,7 +111,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"ab4a67c917e242e0989cd278c75a510e"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -132,6 +131,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
@@ -158,7 +158,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"4d470212545b8dd76f702fe2444accad"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -179,6 +178,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
@@ -205,7 +205,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"c8ebc60237eb353a52e7278c96e50a74"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -226,6 +225,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
@@ -252,7 +252,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"22a1e83f9f1b185fee3c792c15015af0"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -273,6 +272,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
diff --git a/testing/tests/regression-suite/870-Principal-PROPFIND.result b/testing/tests/regression-suite/870-Principal-PROPFIND.result
index c6d79e4e..05c14848 100644
--- a/testing/tests/regression-suite/870-Principal-PROPFIND.result
+++ b/testing/tests/regression-suite/870-Principal-PROPFIND.result
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -18,7 +18,6 @@
     <getcontentlanguage/>
     <getcontentlength/>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <resourcetype>
      <principal/>
@@ -39,6 +38,7 @@
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <lockdiscovery/>
     <source/>
     <checked-in/>
diff --git a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
index 002665ce..ece5f30c 100644
--- a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
+++ b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
@@ -1,8 +1,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
-ETag: "ab183d93ccc90f7e2e0da7446e69e378"
-Content-Length: 5275
+ETag: "2838d6f29caac1487eb93606999277dc"
+Content-Length: 4835
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -52,20 +52,20 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
-    <getetag>"89514106d00f37cc9ee71689c450d2ef"</getetag>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <current-user-privilege-set>
      <privilege>
       <read/>
      </privilege>
     </current-user-privilege-set>
-    <A:getctag>"89514106d00f37cc9ee71689c450d2ef"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <C:supported-calendar-component-set/>
+    <A:getctag/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
@@ -83,20 +83,20 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
-    <getetag>"ab4a67c917e242e0989cd278c75a510e"</getetag>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <current-user-privilege-set>
      <privilege>
       <read/>
      </privilege>
     </current-user-privilege-set>
-    <A:getctag>"ab4a67c917e242e0989cd278c75a510e"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <C:supported-calendar-component-set/>
+    <A:getctag/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
@@ -114,20 +114,20 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
-    <getetag>"4d470212545b8dd76f702fe2444accad"</getetag>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <current-user-privilege-set>
      <privilege>
       <read/>
      </privilege>
     </current-user-privilege-set>
-    <A:getctag>"4d470212545b8dd76f702fe2444accad"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <C:supported-calendar-component-set/>
+    <A:getctag/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
@@ -145,20 +145,20 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
-    <getetag>"c8ebc60237eb353a52e7278c96e50a74"</getetag>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <current-user-privilege-set>
      <privilege>
       <read/>
      </privilege>
     </current-user-privilege-set>
-    <A:getctag>"c8ebc60237eb353a52e7278c96e50a74"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <C:supported-calendar-component-set/>
+    <A:getctag/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
@@ -176,20 +176,20 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
      <collection/>
     </resourcetype>
-    <getetag>"22a1e83f9f1b185fee3c792c15015af0"</getetag>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <current-user-privilege-set>
      <privilege>
       <read/>
      </privilege>
     </current-user-privilege-set>
-    <A:getctag>"22a1e83f9f1b185fee3c792c15015af0"</A:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
+    <getetag/>
     <C:supported-calendar-component-set/>
+    <A:getctag/>
     <G:component-set/>
     <C:calendar-description/>
     <C1:supported-address-data/>
diff --git a/testing/tests/regression-suite/912-Space-PROPFIND.result b/testing/tests/regression-suite/912-Space-PROPFIND.result
index 9ba739b6..3bfddc48 100644
--- a/testing/tests/regression-suite/912-Space-PROPFIND.result
+++ b/testing/tests/regression-suite/912-Space-PROPFIND.result
@@ -1,17 +1,16 @@
 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
-ETag: "19ae9b52cb321d7735b6000bf6983b5a"
-Content-Length: 3128
+ETag: "cbdd4eaa0e099bc7a2dba03c79b70e16"
+Content-Length: 3086
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:A="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:A1="http://apple.com/ns/ical/">
+<multistatus xmlns="DAV:" xmlns:C="http://calendarserver.org/ns/" xmlns:C1="urn:ietf:params:xml:ns:caldav" xmlns:A="http://apple.com/ns/ical/">
  <response>
   <href>/caldav.php/User%20Six/</href>
   <propstat>
    <prop>
-    <A:getctag>"f077f746d340bc4f1998b35342411363"</A:getctag>
     <displayname>User 6</displayname>
     <resourcetype>
      <principal/>
@@ -22,10 +21,11 @@ Content-Type: text/xml; charset="utf-8"
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C:getctag/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -36,20 +36,20 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:calendar/>
-     <C:schedule-calendar/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>User Six home</displayname>
-    <A:getctag>"759d51f273f3a052dc930a6795f6e070"</A:getctag>
+    <C:getctag>"759d51f273f3a052dc930a6795f6e070"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -60,20 +60,20 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <resourcetype>
      <collection/>
-     <C:calendar/>
-     <C:schedule-calendar/>
+     <C1:calendar/>
+     <C1:schedule-calendar/>
     </resourcetype>
     <displayname>Space Calendar</displayname>
-    <A:getctag>"d0711d9c33f6c22359ee83adb7751cda"</A:getctag>
-    <A1:calendar-color>#391B71A0</A1:calendar-color>
+    <C:getctag>"d0711d9c33f6c22359ee83adb7751cda"</C:getctag>
+    <A:calendar-color>#391B71A0</A:calendar-color>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -85,19 +85,19 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-read/>
+     <C:calendar-proxy-read/>
     </resourcetype>
     <displayname>/User Six/calendar-proxy-read/</displayname>
-    <A:getctag>"7032a440adf6aaab2a81cd3bc214d153"</A:getctag>
+    <C:getctag>"7032a440adf6aaab2a81cd3bc214d153"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
@@ -109,19 +109,19 @@ Content-Type: text/xml; charset="utf-8"
     <resourcetype>
      <collection/>
      <principal/>
-     <A:calendar-proxy-write/>
+     <C:calendar-proxy-write/>
     </resourcetype>
     <displayname>/User Six/calendar-proxy-write/</displayname>
-    <A:getctag>"d729246362363c87ec3d13d6eaa99efa"</A:getctag>
+    <C:getctag>"d729246362363c87ec3d13d6eaa99efa"</C:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
   <propstat>
    <prop>
-    <C:calendar-free-busy-set/>
-    <C:calendar-description/>
-    <A1:calendar-color/>
-    <A1:calendar-order/>
+    <C1:calendar-free-busy-set/>
+    <C1:calendar-description/>
+    <A:calendar-color/>
+    <A:calendar-order/>
    </prop>
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>