diff --git a/calendar_ical/calendar-view-ical.tpl.php b/calendar_ical/calendar-view-ical.tpl.php
index d9c2c83..e165b1c 100644
--- a/calendar_ical/calendar-view-ical.tpl.php
+++ b/calendar_ical/calendar-view-ical.tpl.php
@@ -33,10 +33,18 @@ BEGIN:VEVENT
 UID:<?php print($event['uid'] . "\r\n") ?>
 SUMMARY:<?php print($event['summary'] . "\r\n") ?>
 DTSTAMP:<?php print($current_date . "Z\r\n") ?>
+<?php if (!strpos( $event['start'],'T')): ?>
+DTSTART;VALUE=DATE:<?php print($event['start'] . "\r\n") ?>
+<?php else: ?>
 DTSTART:<?php print($event['start'] . "Z\r\n") ?>
+<?php endif; ?>
 <?php if (!empty($event['end'])): ?>
+<?php if (!strpos( $event['end'],'T')): ?>
+DTEND;VALUE=DATE:<?php print( $event['end'] . "\r\n") ?>
+<?php else: ?>
 DTEND:<?php print($event['end'] . "Z\r\n") ?>
 <?php endif; ?>
+<?php endif; ?>
 <?php if (!empty($event['rrule'])) : ?>
 <?php print($event['rrule'] . "\r\n") ?>
 <?php endif; ?>