diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp
index ac522de4db..4f2772471c 100644
--- a/rtl/win/sysutils.pp
+++ b/rtl/win/sysutils.pp
@@ -1243,9 +1243,15 @@ begin
         HF:='h'
       else
         HF:='hh';
-      // No support for 12 hour stuff at the moment...
       ShortTimeFormat := HF+':nn';
       LongTimeFormat := HF + ':nn:ss';
+      { 12-hour system support }
+      if GetLocaleInt(LID, LOCALE_ITIME, 1) = 0 then
+      begin
+        LongTimeFormat := LongTimeFormat + ' AMPM';
+        ShortTimeFormat := ShortTimeFormat + ' AMPM';
+      end;
+
       { Currency stuff }
       CurrencyString:=GetLocaleStr(LID, LOCALE_SCURRENCY, '');
       CurrencyFormat:=StrToIntDef(GetLocaleStr(LID, LOCALE_ICURRENCY, '0'), 0);