diff --git a/calendar_ical/calendar-view-ical.tpl.php b/calendar_ical/calendar-view-ical.tpl.php
index f7cf350..aba17e9 100644
--- a/calendar_ical/calendar-view-ical.tpl.php
+++ b/calendar_ical/calendar-view-ical.tpl.php
@@ -22,12 +22,12 @@
  * comply with the iCal spec: http://tools.ietf.org/html/rfc5545#section-3.1.
  **/
 
-if (empty($method)) {
+if (empty($method)):
   $method = 'PUBLISH';
-}
+endif;
 print "BEGIN:VCALENDAR\r\n";
 print "VERSION:2.0\r\n";
-print "METHOD:print $method\r\n";
+print "METHOD:$method\r\n";
 if (!empty($calname)):
   print "X-WR-CALNAME;VALUE=TEXT:$calname\r\n";
 endif;
@@ -37,9 +37,17 @@ foreach($events as $event):
     print "UID:" . $event['uid'] . "\r\n";
     print "SUMMARY:" . $event['summary'] . "\r\n";
     print "DTSTAMP:" . $current_date . "Z\r\n";
+  if (!strpos($event['start'], 'T')):
+    print "DTSTART;VALUE=DATE:" . $event['start'] . "\r\n";
+  else:
     print "DTSTART:" . $event['start'] . "Z\r\n";
+  endif;
   if (!empty($event['end'])):
-    print "DTEND:" . $event['end'] . "Z\r\n";
+    if (!strpos($event['end'], 'T')):
+      print "DTEND;VALUE=DATE:" . $event['end'] . "\r\n";
+    else:
+      print "DTEND:" . $event['end'] . "Z\r\n";
+    endif;
   endif;
   if (!empty($event['rrule'])):
     print $event['rrule'] . "\r\n";