diff --git a/calendar_ical/calendar-view-ical.tpl.php b/calendar_ical/calendar-view-ical.tpl.php
index 5b3a4d4..8416e08 100644
--- a/calendar_ical/calendar-view-ical.tpl.php
+++ b/calendar_ical/calendar-view-ical.tpl.php
@@ -28,7 +28,7 @@ if (empty($method)) {
 BEGIN:VCALENDAR
 VERSION:2.0
 METHOD:<?php print $method; ?>
-<?php if !empty($calname): ?>
+<?php if (!empty($calname)): ?>
 X-WR-CALNAME;VALUE=TEXT:<?php print $calname . "\r\n"; ?>
 <?php endif; ?>
 PRODID:-//Drupal iCal API//EN
@@ -37,10 +37,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 (preg_match('/^\d+$/', $event['start'])): ?>
+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 (preg_match('/^\d+$/', $event['end'])): ?>
+DTEND;VALUE=DATE:<?php print( ($event['end'] + 1) . "\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; ?>