diff -urp event/event.info dev/sites/all/modules/event/event.info
--- event/event.info	2008-11-22 19:05:40.000000000 -0500
+++ dev/sites/all/modules/event/event.info	2008-11-23 03:10:00.000000000 -0500
@@ -3,10 +3,11 @@ name = Event
 description = Calendaring API, calendar display and export
 package = Event
 core = 6.x
+dependencies[] = date_api
 
diff -urp event/event.module dev/sites/all/modules/event/event.module
--- event/event.module	2008-11-22 17:32:05.000000000 -0500
+++ dev/sites/all/modules/event/event.module	2008-11-23 03:26:39.000000000 -0500
@@ -2278,10 +2310,15 @@ function event_nodeapi(&$node, $op, $tea
 
         $node->event['start_exploded'] = event_explode_date($node->event['start']);
         $node->event['end_exploded'] = event_explode_date($node->event['end']);
-        $node->event['start_format'] = event_format_date($node->event['start_exploded'], 'small');
-        $node->event['start_time_format'] = event_format_date($node->event['start_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
-        $node->event['end_format'] = event_format_date($node->event['end_exploded'], 'small');
-        $node->event['end_time_format'] = event_format_date($node->event['end_exploded'], 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'));
+        $format = variable_get('date_format_short', 'm/d/Y - H:i');
+        if (!$node->event['has_time']) {
+          $format = date_limit_format($format, array('year', 'month', 'day'));
+        }
+        $format_time = date_limit_format($format, array('hour', 'minute'));
+        $node->event['start_format'] = event_format_date($node->event['start'], 'custom', $format);
+        $node->event['start_time_format'] = event_format_date($node->event['start'], 'custom', $format_time);
+        $node->event['end_format'] = event_format_date($node->event['end'], 'custom', $format);
+        $node->event['end_time_format'] = event_format_date($node->event['end'], 'custom', $format_time);
 
         include_once(EVENT_PATH .'/event.theme');
         $node->content['event'] = array(