diff --git a/inc/CalDAVPrincipal.php b/inc/CalDAVPrincipal.php
index 62a2a79e..8b184f98 100644
--- a/inc/CalDAVPrincipal.php
+++ b/inc/CalDAVPrincipal.php
@@ -373,7 +373,7 @@ class CalDAVPrincipal
         case 'urn:ietf:params:xml:ns:caldav:schedule-outbox-URL':
           $reply->CalDAVElement($prop, "schedule-outbox-URL", $reply->href($this->schedule_outbox_url) );
           break;
-
+/*
         case 'http://calendarserver.org/ns/:dropbox-home-URL':
           $reply->CalendarserverElement($prop, "dropbox-home-URL", $reply->href($this->dropbox_url) );
           break;
@@ -381,7 +381,7 @@ class CalDAVPrincipal
         case 'http://calendarserver.org/ns/:notifications-URL':
           $reply->CalendarserverElement($prop, "notifications-URL", $reply->href($this->notifications_url) );
           break;
-
+*/
         case 'urn:ietf:params:xml:ns:caldav:calendar-home-set':
           $reply->CalDAVElement($prop, "calendar-home-set", $reply->href( $this->calendar_home_set ) );
           break;
diff --git a/inc/caldav-PROPFIND.php b/inc/caldav-PROPFIND.php
index d9041c6a..2c60bf05 100644
--- a/inc/caldav-PROPFIND.php
+++ b/inc/caldav-PROPFIND.php
@@ -78,8 +78,6 @@ foreach( $request->xml_tags AS $k => $v ) {
     case 'http://calendarserver.org/ns/:getctag':                        /** Calendar Server extension like etag - should work fine (we just return etag) */
     case 'http://calendarserver.org/ns/:calendar-proxy-read-for':	       /** Calendar Server Delegation readonly */
     case 'http://calendarserver.org/ns/:calendar-proxy-write-for':       /** Calendar Server Delegation read-write */
-    case 'http://calendarserver.org/ns/:dropbox-home-URL':
-    case 'http://calendarserver.org/ns/:notifications-URL':
 
       $prop_list[$ns_tag] = $ns_tag;
       dbg_error_log( "PROPFIND", "Adding attribute '%s'", $ns_tag );
@@ -89,9 +87,6 @@ foreach( $request->xml_tags AS $k => $v ) {
     case 'DAV::supported-collation-set':
     case 'DAV::principal-collection-set':
     case 'DAV::supported-privilege-set':
-
-//    case 'dropbox-home-URL':   // HTTP://CALENDARSERVER.ORG/NS/
-//    case 'notifications-URL':  // HTTP://CALENDARSERVER.ORG/NS/
       if ( $_SERVER['PATH_INFO'] == '/' || $_SERVER['PATH_INFO'] == '' ) {
         $arbitrary[$ns_tag] = $ns_tag;
         dbg_error_log( "PROPFIND", "Adding arbitrary DAV property '%s'", $ns_tag );
@@ -129,6 +124,8 @@ foreach( $request->xml_tags AS $k => $v ) {
     /**
     * Arbitrary DAV properties may also be reported
     */
+    case 'http://calendarserver.org/ns/:dropbox-home-URL':    // Not yet supported (what is it supposed to do?)
+    case 'http://calendarserver.org/ns/:notifications-URL':   // Not yet supported (what is it supposed to do?)
     case 'urn:ietf:params:xml:ns:caldav:calendar-description':        // Supported purely as an arbitrary property
     default:
       $arbitrary[$ns_tag] = $ns_tag;
@@ -211,14 +208,14 @@ function add_principal_properties( &$prop, &$denied ) {
   if ( isset($prop_list['urn:ietf:params:xml:ns:caldav:schedule-outbox-URL'] ) ) {
     $reply->CalDAVElement( $prop, "schedule-outbox-URL", $reply->href( $request->principal->schedule_outbox_url) );
   }
-
+/*  Not supported - don't pretend we do!
   if ( isset($prop_list['http://calendarserver.org/ns/:dropbox-home-URL'] ) ) {
     $reply->CalendarserverElement($prop, "dropbox-home-URL", $reply->href( $request->principal->dropbox_url) );
   }
   if ( isset($prop_list['http://calendarserver.org/ns/:notifications-URL'] ) ) {
     $reply->CalendarserverElement($prop, "notifications-URL", $reply->href( $request->principal->notifications_url) );
   }
-
+*/
   if ( isset($prop_list['urn:ietf:params:xml:ns:caldav:calendar-user-address-set'] ) ) {
     $reply->CalDAVElement( $prop, "calendar-user-address-set", href_set_from_paths( $request->principal->user_address_set ) );
   }
@@ -582,6 +579,7 @@ function item_to_xml( $item ) {
   return build_propstat_response( $prop, $denied, $url );
 }
 
+
 /**
 * Get XML response for items in the collection
 * If '/' is requested, a list of visible users is given, otherwise
diff --git a/testing/tests/regression-suite/501-iCal-PROPFIND.result b/testing/tests/regression-suite/501-iCal-PROPFIND.result
index 661875a4..a9b69033 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: "66e8dfdd986cf80ca4e0a454a5f403e4"
-Content-Length: 969
+ETag: "84248a83d10735003afd060f33219444"
+Content-Length: 924
 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://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user1/</href>
   <propstat>
@@ -24,15 +24,16 @@ Content-Type: text/xml; charset="utf-8"
     <C:schedule-outbox-URL>
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
-    <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>
     <displayname>User 1</displayname>
    </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 abceaba4..55eade7d 100644
--- a/testing/tests/regression-suite/510-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/510-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: "11740641e5c394d33bff9992af54319a"
-Content-Length: 978
+ETag: "2a9abfc44969a1ca9913a13bc2008f1b"
+Content-Length: 933
 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://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
@@ -21,12 +21,6 @@ Content-Type: text/xml; charset="utf-8"
     <C:schedule-outbox-URL>
      <href>/caldav.php/user1/.out/</href>
     </C:schedule-outbox-URL>
-    <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>
     <C:calendar-user-address-set>
      <href>mailto:user1@example.net</href>
      <href>/caldav.php/user1/</href>
@@ -34,5 +28,12 @@ Content-Type: text/xml; charset="utf-8"
    </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/511-iCal-PROPFIND.result b/testing/tests/regression-suite/511-iCal-PROPFIND.result
index 582a3202..98606be2 100644
--- a/testing/tests/regression-suite/511-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/511-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: "1b401fd0240fca62c1852d3392935ec0"
-Content-Length: 901
+ETag: "f198ba2785d7ce129f5017d877e37a9b"
+Content-Length: 878
 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://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/</href>
   <propstat>
@@ -21,12 +21,6 @@ Content-Type: text/xml; charset="utf-8"
     <C:schedule-outbox-URL>
      <href>/user1/.out/</href>
     </C:schedule-outbox-URL>
-    <A:dropbox-home-URL>
-     <href>/user1/.drop/</href>
-    </A:dropbox-home-URL>
-    <A:notifications-URL>
-     <href>/user1/.notify/</href>
-    </A:notifications-URL>
     <C:calendar-user-address-set>
      <href>mailto:user1@example.net</href>
      <href>/user1/</href>
@@ -34,5 +28,12 @@ Content-Type: text/xml; charset="utf-8"
    </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/523-iCal-PROPFIND.result b/testing/tests/regression-suite/523-iCal-PROPFIND.result
index 0ef6c962..3d60fa1a 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: "24e8f1abe05b588f205fda4b1a6da119"
-Content-Length: 969
+ETag: "0854d21be0b64c46991001904f788ffe"
+Content-Length: 924
 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://calendarserver.org/ns/">
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:C1="http://calendarserver.org/ns/">
  <response>
   <href>/caldav.php/user2/</href>
   <propstat>
@@ -25,15 +25,16 @@ Content-Type: text/xml; charset="utf-8"
     <C:schedule-outbox-URL>
      <href>/caldav.php/user2/.out/</href>
     </C:schedule-outbox-URL>
-    <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>
     <displayname>User 2</displayname>
    </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>