diff --git a/components/tvplanit/source/vpclock.pas b/components/tvplanit/source/vpclock.pas
index 05074c5a0..366c63aae 100644
--- a/components/tvplanit/source/vpclock.pas
+++ b/components/tvplanit/source/vpclock.pas
@@ -1296,13 +1296,13 @@ begin
 
     if DisplayMode = dmDigital then begin
       if FDigitalOptions.ShowSeconds and FMilitaryTime then
-        TimeStr := FormatDateTime('hh:mm:ss', FTime)
+        TimeStr := FormatDateTime('hh:nn:ss', FTime)
       else if FDigitalOptions.ShowSeconds and not FMilitaryTime then
-        TimeStr := FormatDateTime('hh:mm:ss am/pm', FTime)
+        TimeStr := FormatDateTime('hh:nn:ss am/pm', FTime)
       else if not FDigitalOptions.ShowSeconds and FMilitaryTime then
-        TimeStr := FormatDateTime('hh:mm', FTime)
+        TimeStr := FormatDateTime('hh:nn', FTime)
       else if not FDigitalOptions.ShowSeconds and not FMilitaryTime then
-        TimeStr := FormatDateTime('hh:mm am/pm', FTime);
+        TimeStr := FormatDateTime('hh:nn am/pm', FTime);
       ckLEDDisplay.Caption := TimeStr;
     end;
 
diff --git a/components/tvplanit/source/vpeventrpt.pas b/components/tvplanit/source/vpeventrpt.pas
index ba99dc738..29f609d76 100644
--- a/components/tvplanit/source/vpeventrpt.pas
+++ b/components/tvplanit/source/vpeventrpt.pas
@@ -1637,14 +1637,14 @@ var
         EventStr := '';
         if ShowEventTime then begin
           if TimeFormat = tf24Hour then
-            EventStr := FormatDateTime ('hh:mm',
+            EventStr := FormatDateTime ('hh:nn',
                             TVpEvent (EventList.List^[j]).StartTime) +
-                            ' - ' + FormatDateTime('hh:mm',
+                            ' - ' + FormatDateTime('hh:nn',
                             TVpEvent (EventList.List^[j]).EndTime) + ': '
           else
-            EventStr := FormatDateTime ('hh:mm AM/PM',
+            EventStr := FormatDateTime ('hh:nn AM/PM',
                           TVpEvent (EventList.List^[j]).StartTime) +
-                          ' - ' + FormatDateTime('hh:mm AM/PM',
+                          ' - ' + FormatDateTime('hh:nn AM/PM',
                           TVpEvent (EventList.List^[j]).EndTime) + ': ';
         end;
 
diff --git a/components/tvplanit/source/vpevnteditdlg.pas b/components/tvplanit/source/vpevnteditdlg.pas
index 77758aaba..2d00822e9 100644
--- a/components/tvplanit/source/vpevnteditdlg.pas
+++ b/components/tvplanit/source/vpevnteditdlg.pas
@@ -353,8 +353,8 @@ begin
   StartDate.Date := Event.StartTime;
   EndDate.Date := Event.EndTime;
   RepeatUntil.Date := Event.RepeatRangeEnd;
-  StartTime.Text := FormatDateTime('hh:mm',Event.StartTime);
-  EndTime.Text := FormatDateTime('hh:mm',Event.EndTime);
+  StartTime.Text := FormatDateTime('hh:nn',Event.StartTime);
+  EndTime.Text := FormatDateTime('hh:nn',Event.EndTime);
 
   StartTimeChange(Self);
   CBAllDay.Checked := Event.AllDayEvent;
@@ -444,9 +444,9 @@ begin
   { follow the start time by 30 minutes }
   if ST > StrToTime(EndTime.Text) then begin
     if TimeFormat = tf24Hour then
-      EndTime.Text := FormatDateTime('h:mm', ST + 30 / MinutesInDay)
+      EndTime.Text := FormatDateTime('h:nn', ST + 30 / MinutesInDay)
     else
-      EndTime.Text := FormatDateTime('hh:mm AM/PM', ST + 30 / MinutesInDay);
+      EndTime.Text := FormatDateTime('hh:nn AM/PM', ST + 30 / MinutesInDay);
   end;
 
 end;
@@ -774,7 +774,7 @@ begin
   {  time to  follow the start time by 30 minutes                      } 
 
   if ST > EndDate.Date + StrToTime (EndTime.Text) then
-    EndTime.Text := FormatDateTime('hh:mm', ST + 30 / MinutesInDay);
+    EndTime.Text := FormatDateTime('hh:nn', ST + 30 / MinutesInDay);
 end;                                                                     
 
 procedure TDlgEventEdit.EndTimeExit(Sender: TObject);                    
@@ -795,7 +795,7 @@ begin
   { start time to precede the end time by 30 minutes                   } 
 
   if ET < StartDate.Date + StrToTime (StartTime.Text) then
-    StartTime.Text := FormatDateTime('hh:mm', ET - 30 / MinutesInDay);
+    StartTime.Text := FormatDateTime('hh:nn', ET - 30 / MinutesInDay);
 end;                                                                     
 
 end.
diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas
index cac4744e0..0a3b8c417 100644
--- a/components/tvplanit/source/vpmonthview.pas
+++ b/components/tvplanit/source/vpmonthview.pas
@@ -1092,10 +1092,10 @@ var
               { format the display text }
               if ShowEventTime then begin
                 if (TimeFormat = tf24Hour) then
-                  Str := FormatDateTime('hh:mm',
+                  Str := FormatDateTime('hh:nn',
                     TVpEvent(EventList.List^[j]).StartTime)
                 else
-                  Str := FormatDateTime('hh:mm AM/PM',
+                  Str := FormatDateTime('hh:nn AM/PM',
                     TVpEvent(EventList.List^[j]).StartTime);
                 Str := Str + ' - ' + TVpEvent(EventList.List^[j]).Description;
               end else
diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index d8a6aae36..01b10d345 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -888,11 +888,11 @@ var
             if ShowEventTime then
               begin
                if TimeFormat = tf24Hour then
-                 DayStr := FormatDateTime('hh:mm',TodayStartTime)
-                  + ' - ' + FormatDateTime('hh:mm',TodayEndTime) + ': '
+                 DayStr := FormatDateTime('hh:nn',TodayStartTime)
+                  + ' - ' + FormatDateTime('hh:nn',TodayEndTime) + ': '
               else
-                DayStr := FormatDateTime('hh:mm AM/PM',TVpEvent(EventList.List^[j]).StartTime)
-                  + ' - ' + FormatDateTime('hh:mm AM/PM',TVpEvent(EventList.List^[j]).EndTime) + ': ';
+                DayStr := FormatDateTime('hh:nn AM/PM',TVpEvent(EventList.List^[j]).StartTime)
+                  + ' - ' + FormatDateTime('hh:nn AM/PM',TVpEvent(EventList.List^[j]).EndTime) + ': ';
               end;
             if DayStr = '' then
               DayStr := TVpEvent(EventList.List^[j]).Description