diff -urN event-cvs/event.module event-fix/event.module
--- event-cvs/event.module	2005-05-24 09:15:14.000000000 +0100
+++ event-fix/event.module	2005-05-26 19:57:45.000000000 +0100
@@ -1423,7 +1423,7 @@
           global $user;
           $form = form_item(t('Start'), event_form_date(($node->event_start ? $node->event_start : _event_user_time()), 'start', $node->start_offset), t('Start date.'));
 
-          $form .= form_item(t('End'), event_form_date(($node->event_rnd ? $node->event_end : _event_user_time()), 'end', $node->end_offset), t('End date.'));
+          $form .= form_item(t('End'), event_form_date(($node->event_end ? $node->event_end : _event_user_time()), 'end', $node->end_offset), t('End date.'));
 
           if (variable_get('event_timezone_input', 'site') == 'input') {
             $form .= form_select(t('Time zone'), 'timezone', ($node->timezone ? $node->timezone : event_timezone_map(variable_get('date_default_timezone', 0))), event_zonelist(), t('Select the time zone this event occurs in.'));
diff -urN event-cvs/event.theme event-fix/event.theme
--- event-cvs/event.theme	2005-05-24 09:15:14.000000000 +0100
+++ event-fix/event.theme	2005-05-26 19:42:04.000000000 +0100
@@ -60,12 +60,12 @@
  */
 function theme_event_node_day($node, $module = NULL) {
   $output .= '<div class="event dayview">'."\n";
-  $output .= '<div class="type">'. l('('. $node->event_node_title .')', 'event/'.gmdate('Y/m/d', $node->start).'/day/'.$node->type, array('title' => t('limit view to events of this type'))).'</div>'."\n";
+  $output .= '<div class="type">'. l('('. $node->event_node_title .')', 'event/'.gmdate('Y/m/d', $node->event_start).'/day/'.$node->type, array('title' => t('limit view to events of this type'))).'</div>'."\n";
 
   $output .= '<div class="title">'. l($node->title, "node/$node->nid", array('title' => t('view this event'))) .'</div>'."\n";
 
   $output .= '<div class="start">'. t('Start') .': '. $node->start_format .'</div>'."\n";
-  if ($node->start != $node->end) {
+  if ($node->event_start != $node->event_end) {
     $output .= '<div class="end">'. t('End') .': '. $node->end_format .'</div>'."\n";
   }
   $output .= '<div class="content">'. $node->teaser ."</div>\n";
@@ -101,7 +101,7 @@
   switch ($node->event_state) {
     case 'singleday';
         $times = '<div class="start">'. t('Start') .': '. $node->start_time_format .'</div>'."\n";
-        if ($node->start != $node->end) {
+        if ($node->event_start != $node->event_end) {
           $times .= '<div class="end">'. t('End') .': '. $node->end_time_format .'</div>'."\n";
         }
       break;
@@ -151,7 +151,7 @@
   switch ($node->event_state) {
     case 'singleday';
         $times = '<div class="start">'. t('Start') .': '. $node->start_time_format .'</div>'."\n";
-        if ($node->start != $node->end) {
+        if ($node->event_start != $node->event_end) {
           $times .= '<div class="end">'. t('End') .': '. $node->end_time_format .'</div>'."\n";
         }
       break;
@@ -200,7 +200,7 @@
   $output .= '<div class="event tableview">'."\n";
   $output .= '<div class="stripe-'. $stripe_map[$node->nid] .'"></div>'."\n";
   if (!$module) {
-    $output .= '<div class="type">'. l('('. $node->event_node_title .')', 'event/'.gmdate('Y/m/d', $node->start).'/table/'.$node->type, array('title' => t('limit view to events of this type'))).'</div>'."\n";
+    $output .= '<div class="type">'. l('('. $node->event_node_title .')', 'event/'.gmdate('Y/m/d', $node->event_start).'/table/'.$node->type, array('title' => t('limit view to events of this type'))).'</div>'."\n";
   }
   $output .= '<div class="title">'. l($node->title, "node/$node->nid", array('title' => t('view this event'))) .'</div>'."\n";