diff --git a/apps/calendar/ajax/editevent.php b/apps/calendar/ajax/editevent.php
index 3abf4de98b3934252d10047cfeb726223f7113e3..a60b0946ad2fb97fc0b5b6f60e00ad892ce21926 100644
--- a/apps/calendar/ajax/editevent.php
+++ b/apps/calendar/ajax/editevent.php
@@ -34,7 +34,7 @@ if($errarr){
 		OC_JSON::error();
 		exit;
 	}
-	$vcalendar = Sabre_VObject_Reader::read($data['calendardata']);
+	$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
 	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
 	$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 	if ($data['calendarid'] != $cal) {
diff --git a/apps/calendar/ajax/editeventform.php b/apps/calendar/ajax/editeventform.php
index 34d6c657cecac79c521222e5a6b72316f421c078..e6dc8136601ff0133c6157b38f44a07a84c9668e 100644
--- a/apps/calendar/ajax/editeventform.php
+++ b/apps/calendar/ajax/editeventform.php
@@ -26,7 +26,7 @@ if($calendar['userid'] != OC_User::getUser()){
 		echo $l10n->t('Wrong calendar');
 		exit;
 }
-$object = Sabre_VObject_Reader::read($data['calendardata']);
+$object = OC_Calendar_Object::parse($data['calendardata']);
 $vevent = $object->VEVENT;
 $dtstart = $vevent->DTSTART;
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 5c4cced8d20fee4466aa111fd3fea5c4ecd6869f..5ee2ffb6276e3a4711d7b7bf6a110b809ae65ced 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -21,7 +21,7 @@ $return = array();
 foreach($events as $event)
 {
 	$return_event = array();
-	$object = Sabre_VObject_Reader::read($event['calendardata']);
+	$object = OC_Calendar_Object::parse($event['calendardata']);
 	$vevent = $object->VEVENT;
 	$dtstart = $vevent->DTSTART;
 	$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
diff --git a/apps/calendar/ajax/moveevent.php b/apps/calendar/ajax/moveevent.php
index 1fef1c5b20060f176ae83fdcc68e53ba6036794d..834a454fca2a6028e7081b435c70f9922dd81d25 100644
--- a/apps/calendar/ajax/moveevent.php
+++ b/apps/calendar/ajax/moveevent.php
@@ -22,7 +22,7 @@ $delta = new DateInterval('P0D');
 $delta->d = $_POST['dayDelta'];
 $delta->i = $_POST['minuteDelta'];
 
-$vcalendar = Sabre_VObject_Reader::read($data['calendardata']);
+$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
 $vevent = $vcalendar->VEVENT;
 
 $dtstart = $vevent->DTSTART;
diff --git a/apps/calendar/ajax/resizeevent.php b/apps/calendar/ajax/resizeevent.php
index 3a2bf87afd9f97a11aa3a6fa0659c8c2756293f2..639ef91ee7cd42e16f06f031a54d96fb52a3580b 100644
--- a/apps/calendar/ajax/resizeevent.php
+++ b/apps/calendar/ajax/resizeevent.php
@@ -22,7 +22,7 @@ $delta = new DateInterval('P0D');
 $delta->d = $_POST['dayDelta'];
 $delta->i = $_POST['minuteDelta'];
 
-$vcalendar = Sabre_VObject_Reader::read($data['calendardata']);
+$vcalendar = OC_Calendar_Object::parse($data['calendardata']);
 $vevent = $vcalendar->VEVENT;
 
 $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);