diff --git a/build/service/CalendarExtractor.php b/build/service/CalendarExtractor.php
index f810414..830f742 100644
--- a/build/service/CalendarExtractor.php
+++ b/build/service/CalendarExtractor.php
@@ -251,7 +251,7 @@
 			$ts = strtotime("${day} $hour:$min:00");
 
 			/* (3) Return GMT date */
-			return gmdate("Ymd\THis", $ts);
+			return gmdate("Ymd\THis\Z", $ts);
 
 		}
 
@@ -286,9 +286,9 @@
 				---------------------------------------------------------*/
 				foreach($events as $start_t=>$stop_t){
 					$RAW .= "BEGIN:VEVENT\n";
-					$RAW .= "DTSTAMP:${start_t}Z\n"; // required
-					$RAW .= "DTSTART:${start_t}Z\n";
-					$RAW .= "DTEND:${stop_t}Z\n";
+					$RAW .= "DTSTAMP:".gmdate("Ymd\THis\Z", time())."\n"; // required
+					$RAW .= "DTSTART:${start_t}\n";
+					$RAW .= "DTEND:${stop_t}\n";
 					$RAW .= "UID:$start_t@xdrm.io\n";     // required
 					$RAW .= "SUMMARY:$type\n";
 					$RAW .= "END:VEVENT\n\n";