diff --git a/inc/caldav-PROPFIND.php b/inc/caldav-PROPFIND.php
index 3df5cf60..d1cb7f25 100644
--- a/inc/caldav-PROPFIND.php
+++ b/inc/caldav-PROPFIND.php
@@ -61,6 +61,8 @@ foreach( $request->xml_tags AS $k => $v ) {
     case 'DAV::allprop':                        /** limited support, needs to be checked for correctness at some point */
     case 'DAV::group-member-set':               /** limited support, at the moment used for caldav proxy */
     case 'DAV::group-membership':				/** limited support, at the moment used for caldav proxy */
+    case 'DAV::supported-method-set':           /** Should work fine */
+    case 'DAV::supported-report-set':           /** Should work fine */
 
     /**
     * Handled CalDAV properties
@@ -297,6 +299,14 @@ function add_general_properties( &$prop, &$denied, $record ) {
     $reply->DAVElement( $prop, 'supported-privilege-set', privileges( $request->SupportedPrivileges(), 'supported-privilege') );
   }
 
+  if ( isset($prop_list['DAV::supported-method-set']) ) {
+    $reply->DAVElement( $prop, 'supported-method-set', $request->BuildSupportedMethods() );
+  }
+  if ( isset($prop_list['DAV::supported-report-set']) ) {
+    $reply->DAVElement( $prop, 'supported-report-set', $request->BuildSupportedReports() );
+  }
+
+
 }