diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index ca91a79e1a..7049ac8b72 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -150,7 +150,7 @@ class calendar_groupdav extends groupdav_handler
 			return $this->free_busy_report($path, $options, $user);
 		}
 
-		if (isset($_GET['checkout']))
+		if (isset($_GET['download']))
 		{
 			$this->groupdav->propfind_options['props'] = array(array(
 				'xmlns' => groupdav::CALDAV,
@@ -253,7 +253,7 @@ class calendar_groupdav extends groupdav_handler
 			// return iterator, calling ourself to return result in chunks
 			$files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']);
 		}
-		if (isset($_GET['checkout']))
+		if (isset($_GET['download']))
 		{
 			$this->output_vcalendar($files['files']);
 		}
@@ -281,9 +281,14 @@ class calendar_groupdav extends groupdav_handler
 			{
 				if ($n === 2)
 				{
+					// skip X-CALENDARSERVER-ACCESS:CONFIDENTIAL, as it is on VCALENDAR not VEVENT level
+					if (($x_calendarserver_access = strpos($icalendar, 'X-CALENDARSERVER-ACCESS:')) !== false)
+					{
+						echo substr($icalendar, 0, $x_calendarserver_access);
+					}
 					// skip timezones, as we would need to collect them from all events
 					// ans most clients understand timezone by reference anyway
-					if (($tz = strpos($icalendar, 'BEGIN:VTIMEZONE')) !== false)
+					elseif (($tz = strpos($icalendar, 'BEGIN:VTIMEZONE')) !== false)
 					{
 						echo substr($icalendar, 0, $tz);
 					}
diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 1706d550a0..9d0195431d 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -33,6 +33,7 @@ require_once('HTTP/WebDAV/Server.php');
  * - /<current-username>/addressbook-<other-username>/ shared addressbooks from other user or group
  * - /<current-username>/addressbook-accounts/ all accounts current user has rights to see
  * - /<username>/calendar/    calendar of user <username> given the user has rights to view it
+ * - /<username>/calendar/?download download whole calendar as .ics file (GET request!)
  * - /<current-username>/calendar-<other-username>/ shared calendar from other user or group (only current <username>!)
  * - /<username>/inbox/       scheduling inbox of user <username>
  * - /<username>/outbox/      scheduling outbox of user <username>