diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php
new file mode 100644
index 00000000..7fccbc0f
--- /dev/null
+++ b/inc/caldav-REPORT-calquery.php
@@ -0,0 +1,242 @@
+<?php
+
+
+foreach( $request->xml_tags AS $k => $v ) {
+
+  $fulltag = $v['tag'];
+  if ( preg_match('/^(.*):([^:]+)$/', $fulltag, $matches) ) {
+    $xmlns = $matches[1];
+    $xmltag = $matches[2];
+  }
+  else {
+    $xmlns = 'DAV:';
+    $xmltag = $tag;
+  }
+
+  switch ( $fulltag ) {
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-QUERY':
+      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
+      if ( $v['type'] == "open" ) {
+        $reportnum++;
+        $report[$reportnum]['type'] = $xmltag;
+        $report[$reportnum]['include_href'] = 1;
+        $report[$reportnum]['include_data'] = 1;
+      }
+      else {
+        unset($report_type);
+      }
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:FILTER':
+      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
+      if ( $v['type'] == "open" ) {
+        $filters = array();
+      }
+      else if ( $v['type'] == "close" ) {
+        $report[$reportnum]['filters'] = $filters;
+        unset($filters);
+      }
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:IS-DEFINED':
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:COMP-FILTER':
+      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
+      if ( $v['type'] == "close" ) {
+        break;
+      }
+      $filter_name = $v['attributes']['NAME'];
+      dbg_log_array( "REPORT", "COMP-FILTER", $v, true );
+      if ( isset($filters) ) {
+        dbg_error_log( "REPORT", "Adding filter '%s'", $filter_name );
+        $filters[$filter_name] = 1;
+      }
+      else {
+        dbg_error_log( "ERROR", "Not using COMP-FILTER '%s' outside of defined FILTER!", $filter_name );
+      }
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:TIME-RANGE':
+      dbg_log_array( "REPORT", "TIME-RANGE", $v, true );
+      if ( isset($v['attributes']['START']) ) {
+        $report[$reportnum]['start'] = $v['attributes']['START'];
+      }
+      if ( isset($v['attributes']['END']) ) {
+        $report[$reportnum]['end'] = $v['attributes']['END'];
+      }
+      break;
+
+      
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:FILTER':
+      dbg_error_log( "REPORT", "Not using %s information which follows...", $v['tag'] );
+      dbg_log_array( "REPORT", "FILTER", $v, true );
+      break;
+
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:PROP-FILTER':
+      dbg_log_array( "REPORT", "PROP-FILTER", $v, true );
+      if ( $v['type'] == "open" ) {
+        $prop_filter = array( "name" => $v['attributes']['NAME'] );
+      }
+      elseif ( $v['type'] == "close" ) {
+        $report[$reportnum]['propfilter'] = $prop_filter;
+        unset($prop_filter);
+      }
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:TEXT-MATCH':
+      dbg_log_array( "REPORT", "TEXT-MATCH", $v, true );
+      $prop_filter["text-match"] = $v['value'];
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:IS-NOT-DEFINED':
+      dbg_log_array( "REPORT", "TEXT-MATCH", $v, true );
+      $prop_filter["is-not-defined"] = 1;
+      break;
+
+      
+    case 'DAV::PROP':
+      dbg_log_array( "REPORT", "DAV::PROP", $v, true );
+      if ( isset($report[$reportnum]['type']) ) {
+        if ( $v['type'] == "open" ) {
+          $report_properties = array();
+        }
+        else if ( $v['type'] == "close" ) {
+          $report[$reportnum]['properties'] = $report_properties;
+          unset($report_properties);
+        }
+        else {
+          dbg_error_log( "REPORT", "Unexpected DAV::PROP type of ".$v['type'] );
+        }
+      }
+      else {
+        dbg_error_log( "REPORT", "Unexpected DAV::PROP type of ".$v['type']." when no active report type.");
+      }
+      break;
+
+    case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-DATA':
+    case 'DAV::HREF':
+    case 'DAV::GETETAG':
+    case 'DAV::GETCONTENTLENGTH':
+    case 'DAV::GETCONTENTTYPE':
+    case 'DAV::RESOURCETYPE':
+      if ( isset($report_properties) ) {
+        dbg_error_log( "REPORT", "Adding property '%s'", $xmltag );
+        $report_properties[$xmltag] = 1;
+      }
+      else {
+        dbg_error_log( "ERROR", "Not using property '%s' outside of defined report!", $xmltag );
+      }
+      break;
+
+     default:
+      $unsupported[$xmltag] = $xmlns;
+      dbg_error_log( "REPORT", "Unhandled tag >>%s<<", $fulltag );
+  }
+}
+
+$request->UnsupportedRequest($unsupported); // Won't return if there was unsupported stuff.
+
+/**
+ * Build the array of properties to include in the report output
+ */
+$mg_content = $xmltree->GetContent('URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-MULTIGET');
+$proptype = $mg_content[0]->GetTag();
+$properties = array();
+switch( $proptype ) {
+  case 'DAV::PROP':
+    $mg_props = $xmltree->GetPath('/URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-MULTIGET/DAV::PROP/*');
+    foreach( $mg_props AS $k => $v ) {
+      $propertyname = preg_replace( '/^.*:/', '', $v->GetTag() );
+      $properties[$propertyname] = 1;
+    }
+    break;
+
+  case 'DAV::ALLPROP':
+    $properties['ALLPROP'] = 1;
+    break;
+
+  default:
+    $propertyname = preg_replace( '/^.*:/', '', $proptype );
+    $properties[$propertyname] = 1;
+}
+
+/**
+* Return XML for a single calendar (or todo) entry from the DB
+* 
+* @param array $filter The definition of the prop-filter
+* @param string $item The SQL calendar row for this calendar
+* 
+* @return boolean True if the check succeeded, false otherwise.
+*/
+function check_prop_filter( $filter, $item ) {
+  global $session, $c, $request;
+
+  dbg_error_log("REPORT","Checking property filter for item '%s'", $item->dav_name );
+  $ical = new iCalendar( array( "icalendar" => $item->caldav_data) );
+  $property = $ical->Get($filter["name"]);
+  if ( $property == "" && isset($filter["is-not-defined"]) ) return true;
+  
+  foreach( $filter AS $k => $v ) {
+    if ( $k == 'name' || $k == 'is-not-defined' ) continue;
+  }
+}
+
+
+
+/**
+* Something that we can handle, at least roughly correctly.
+*/
+
+$responses = array();
+
+for ( $i=0; $i <= $reportnum; $i++ ) {
+
+  $where = " WHERE caldav_data.dav_name ~ ".qpg("^".$request->path)." ";
+  switch( $report[$i]['type'] ) {
+    case 'CALENDAR-QUERY':
+      if ( ! ($request->AllowedTo('read') ) ) $request->DoResponse( 403, translate("You may not access that calendar") );
+      if ( isset( $report[$i]['start'] ) ) {
+        $where .= "AND (dtend >= ".qpg($report[$i]['start'])."::timestamp with time zone ";
+        $where .= "OR calculate_later_timestamp(".qpg($report[$i]['start'])."::timestamp with time zone,dtend,rrule) >= ".qpg($report[$i]['start'])."::timestamp with time zone) ";
+      }
+      if ( isset( $report[$i]['end'] ) ) {
+        $where .= "AND dtstart <= ".qpg($report[$i]['end'])."::timestamp with time zone ";
+      }
+      break;
+
+    default:
+      dbg_error_log("REPORT", "Unhandled report type of '%s'", $report[$i]['type'] );
+  }
+
+  if ( isset( $report[$i]['filters'] ) ) {
+    /**
+    * Only report on the filtered types that were specified
+    */
+    $filters = "";
+    foreach( $report[$i]['filters'] AS $k => $v ) {
+      $filters .= ($filters == "" ? "" : ", ") . qpg($k);
+    }
+    if ( $filters != "" ) {
+      $where .= "AND caldav_data.caldav_type IN ( $filters ) ";
+    }
+  }
+
+  $where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items
+  if ( isset($c->hide_TODO) && $c->hide_TODO ) {
+    $where .= "AND (caldav_data.caldav_type NOT IN ('VTODO') OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') ";
+  }
+  $qry = new PgQuery( "SELECT * , get_permissions($session->user_no,caldav_data.user_no) as permissions FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name)". $where );
+  if ( $qry->Exec("REPORT",__LINE__,__FILE__) && $qry->rows > 0 ) {
+    while( $calendar_object = $qry->Fetch() ) {
+      if ( !isset($report[$reportnum]['propfilter']) || check_prop_filter( $report[$reportnum]['propfilter'], $calendar_object ) ) {
+        $responses[] = calendar_to_xml( $report[$i]['properties'], $calendar_object );
+      }
+    }
+  }
+}
+$multistatus = new XMLElement( "multistatus", $responses, array('xmlns'=>'DAV:') );
+
+$request->XMLResponse( 207, $multistatus );
+
+?>
\ No newline at end of file
diff --git a/inc/caldav-REPORT.php b/inc/caldav-REPORT.php
index 37f07d46..54a31d8a 100644
--- a/inc/caldav-REPORT.php
+++ b/inc/caldav-REPORT.php
@@ -48,28 +48,6 @@ if ( $xmltree->GetTag() == "URN:IETF:PARAMS:XML:NS:CALDAV:FREE-BUSY-QUERY" ) {
 if ( ! ($request->AllowedTo('read') ) ) $request->DoResponse( 404, translate("You may not access that calendar") );
 
 
-/**
-* Return XML for a single calendar (or todo) entry from the DB
-* 
-* @param array $filter The definition of the prop-filter
-* @param string $item The SQL calendar row for this calendar
-* 
-* @return boolean True if the check succeeded, false otherwise.
-*/
-function check_prop_filter( $filter, $item ) {
-  global $session, $c, $request;
-
-  dbg_error_log("REPORT","Checking property filter for item '%s'", $item->dav_name );
-  $ical = new iCalendar( array( "icalendar" => $item->caldav_data) );
-  $property = $ical->Get($filter["name"]);
-  if ( $property == "" && isset($filter["is-not-defined"]) ) return true;
-  
-  foreach( $filter AS $k => $v ) {
-    if ( $k == 'name' || $k == 'is-not-defined' ) continue;
-  }
-}
-
-
 /**
 * Return XML for a single calendar (or todo) entry from the DB
 * 
@@ -141,7 +119,7 @@ function calendar_to_xml( $properties, $item ) {
 
 if ( $xmltree->GetTag() == "URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-QUERY" ) {
   $calquery = $xmltree->GetPath("/URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-QUERY/*");
-//  include("caldav-REPORT-calendar.php");
+  include("caldav-REPORT-calquery.php");
 }
 elseif ( $xmltree->GetTag() == "URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-MULTIGET" ) {
   $multiget = $xmltree->GetPath("/URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-MULTIGET/*");
@@ -151,197 +129,4 @@ else {
   $request->DoResponse( 501, "XML is not a supported REPORT query document" );
 }
 
-foreach( $request->xml_tags AS $k => $v ) {
-
-  $fulltag = $v['tag'];
-  if ( preg_match('/^(.*):([^:]+)$/', $fulltag, $matches) ) {
-    $xmlns = $matches[1];
-    $xmltag = $matches[2];
-  }
-  else {
-    $xmlns = 'DAV:';
-    $xmltag = $tag;
-  }
-
-  switch ( $fulltag ) {
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-QUERY':
-      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
-      if ( $v['type'] == "open" ) {
-        $reportnum++;
-        $report[$reportnum]['type'] = $xmltag;
-        $report[$reportnum]['include_href'] = 1;
-        $report[$reportnum]['include_data'] = 1;
-      }
-      else {
-        unset($report_type);
-      }
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:FILTER':
-      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
-      if ( $v['type'] == "open" ) {
-        $filters = array();
-      }
-      else if ( $v['type'] == "close" ) {
-        $report[$reportnum]['filters'] = $filters;
-        unset($filters);
-      }
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:IS-DEFINED':
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:COMP-FILTER':
-      dbg_error_log( "REPORT", ":Request: %s -> %s", $v['type'], $xmltag );
-      if ( $v['type'] == "close" ) {
-        break;
-      }
-      $filter_name = $v['attributes']['NAME'];
-      dbg_log_array( "REPORT", "COMP-FILTER", $v, true );
-      if ( isset($filters) ) {
-        dbg_error_log( "REPORT", "Adding filter '%s'", $filter_name );
-        $filters[$filter_name] = 1;
-      }
-      else {
-        dbg_error_log( "ERROR", "Not using COMP-FILTER '%s' outside of defined FILTER!", $filter_name );
-      }
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:TIME-RANGE':
-      dbg_log_array( "REPORT", "TIME-RANGE", $v, true );
-      if ( isset($v['attributes']['START']) ) {
-        $report[$reportnum]['start'] = $v['attributes']['START'];
-      }
-      if ( isset($v['attributes']['END']) ) {
-        $report[$reportnum]['end'] = $v['attributes']['END'];
-      }
-      break;
-
-      
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:FILTER':
-      dbg_error_log( "REPORT", "Not using %s information which follows...", $v['tag'] );
-      dbg_log_array( "REPORT", "FILTER", $v, true );
-      break;
-
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:PROP-FILTER':
-      dbg_log_array( "REPORT", "PROP-FILTER", $v, true );
-      if ( $v['type'] == "open" ) {
-        $prop_filter = array( "name" => $v['attributes']['NAME'] );
-      }
-      elseif ( $v['type'] == "close" ) {
-        $report[$reportnum]['propfilter'] = $prop_filter;
-        unset($prop_filter);
-      }
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:TEXT-MATCH':
-      dbg_log_array( "REPORT", "TEXT-MATCH", $v, true );
-      $prop_filter["text-match"] = $v['value'];
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:IS-NOT-DEFINED':
-      dbg_log_array( "REPORT", "TEXT-MATCH", $v, true );
-      $prop_filter["is-not-defined"] = 1;
-      break;
-
-      
-    case 'DAV::PROP':
-      dbg_log_array( "REPORT", "DAV::PROP", $v, true );
-      if ( isset($report[$reportnum]['type']) ) {
-        if ( $v['type'] == "open" ) {
-          $report_properties = array();
-        }
-        else if ( $v['type'] == "close" ) {
-          $report[$reportnum]['properties'] = $report_properties;
-          unset($report_properties);
-        }
-        else {
-          dbg_error_log( "REPORT", "Unexpected DAV::PROP type of ".$v['type'] );
-        }
-      }
-      else {
-        dbg_error_log( "REPORT", "Unexpected DAV::PROP type of ".$v['type']." when no active report type.");
-      }
-      break;
-
-    case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-DATA':
-    case 'DAV::HREF':
-    case 'DAV::GETETAG':
-    case 'DAV::GETCONTENTLENGTH':
-    case 'DAV::GETCONTENTTYPE':
-    case 'DAV::RESOURCETYPE':
-      if ( isset($report_properties) ) {
-        dbg_error_log( "REPORT", "Adding property '%s'", $xmltag );
-        $report_properties[$xmltag] = 1;
-      }
-      else {
-        dbg_error_log( "ERROR", "Not using property '%s' outside of defined report!", $xmltag );
-      }
-      break;
-
-     default:
-      $unsupported[$xmltag] = $xmlns;
-      dbg_error_log( "REPORT", "Unhandled tag >>%s<<", $fulltag );
-  }
-}
-
-
-
-$request->UnsupportedRequest($unsupported); // Won't return if there was unsupported stuff.
-
-/**
-* Something that we can handle, at least roughly correctly.
-*/
-
-$responses = array();
-
-for ( $i=0; $i <= $reportnum; $i++ ) {
-
-  $where = " WHERE caldav_data.dav_name ~ ".qpg("^".$request->path)." ";
-  switch( $report[$i]['type'] ) {
-    case 'CALENDAR-QUERY':
-      if ( ! ($request->AllowedTo('read') ) ) $request->DoResponse( 403, translate("You may not access that calendar") );
-      if ( isset( $report[$i]['start'] ) ) {
-        $where .= "AND (dtend >= ".qpg($report[$i]['start'])."::timestamp with time zone ";
-        $where .= "OR calculate_later_timestamp(".qpg($report[$i]['start'])."::timestamp with time zone,dtend,rrule) >= ".qpg($report[$i]['start'])."::timestamp with time zone) ";
-      }
-      if ( isset( $report[$i]['end'] ) ) {
-        $where .= "AND dtstart <= ".qpg($report[$i]['end'])."::timestamp with time zone ";
-      }
-      break;
-
-    default:
-      dbg_error_log("REPORT", "Unhandled report type of '%s'", $report[$i]['type'] );
-  }
-
-  if ( isset( $report[$i]['filters'] ) ) {
-    /**
-    * Only report on the filtered types that were specified
-    */
-    $filters = "";
-    foreach( $report[$i]['filters'] AS $k => $v ) {
-      $filters .= ($filters == "" ? "" : ", ") . qpg($k);
-    }
-    if ( $filters != "" ) {
-      $where .= "AND caldav_data.caldav_type IN ( $filters ) ";
-    }
-  }
-
-  $where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items
-  if ( isset($c->hide_TODO) && $c->hide_TODO ) {
-    $where .= "AND (caldav_data.caldav_type NOT IN ('VTODO') OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') ";
-  }
-  $qry = new PgQuery( "SELECT * , get_permissions($session->user_no,caldav_data.user_no) as permissions FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name)". $where );
-  if ( $qry->Exec("REPORT",__LINE__,__FILE__) && $qry->rows > 0 ) {
-    while( $calendar_object = $qry->Fetch() ) {
-      if ( !isset($report[$reportnum]['propfilter']) || check_prop_filter( $report[$reportnum]['propfilter'], $calendar_object ) ) {
-        $responses[] = calendar_to_xml( $report[$i]['properties'], $calendar_object );
-      }
-    }
-  }
-}
-$multistatus = new XMLElement( "multistatus", $responses, array('xmlns'=>'DAV:') );
-
-$request->XMLResponse( 207, $multistatus );
-
 ?>
\ No newline at end of file