diff --git a/components/tvplanit/packages/laz_visualplanit.lpk b/components/tvplanit/packages/laz_visualplanit.lpk
index c9275133e..67cccd2bc 100644
--- a/components/tvplanit/packages/laz_visualplanit.lpk
+++ b/components/tvplanit/packages/laz_visualplanit.lpk
@@ -5,6 +5,7 @@
     <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Original author: TurboPower Software"/>
+    <AutoUpdate Value="OnRebuildingAll"/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
diff --git a/components/tvplanit/source/vpcalendarpainter.pas b/components/tvplanit/source/vpcalendarpainter.pas
index 7bb4ddfa8..5141a856f 100644
--- a/components/tvplanit/source/vpcalendarpainter.pas
+++ b/components/tvplanit/source/vpcalendarpainter.pas
@@ -208,7 +208,11 @@ var
   I: Integer;
   S: string;
   DrawRect: TRect;
+  fontsize: Integer;
 begin
+  {Store the font size}
+  fontsize := RenderCanvas.Font.Size;
+
   {draw the day name column labels}
   RenderCanvas.Font.Color := DayNameColor;
   I := 0;
@@ -236,16 +240,13 @@ begin
     S := SysToUTF8(S);
    {$ENDIF}
 
+    {restore the font size - this is not needed normally, but may solve the
+     issue with growing fonts along this row in MacOSX }
+    RenderCanvas.Font.Size := fontsize;
+
     {draw the day name above each column}
     DrawRect := TVpCalendarOpener(FCalendar).clRowCol[1, I];
     OffsetRect(DrawRect, RealLeft, Realtop);
-    {
-    DrawRect := Rect(
-      clRowCol[1, I].Left + RealLeft,
-      clRowCol[1, I].Top + RealTop,
-      clRowCol[1, I].Right +  RealLeft,
-      clRowCol[1, I].Bottom + RealTop);
-    }
     TPSCenteredTextOut(RenderCanvas, Angle, RenderIn, DrawRect, S);
     Inc(I);
     if DOW < High(DOW) then
diff --git a/components/tvplanit/source/vpcanvasutils.pas b/components/tvplanit/source/vpcanvasutils.pas
index 56987eaf2..6802c5413 100644
--- a/components/tvplanit/source/vpcanvasutils.pas
+++ b/components/tvplanit/source/vpcanvasutils.pas
@@ -752,8 +752,7 @@ begin
   case FCanvas.Font.Pitch of
     fpVariable : LF.lfPitchAndFamily := VARIABLE_PITCH or FF_DONTCARE;
     fpFixed    : LF.lfPitchAndFamily := FIXED_PITCH or FF_DONTCARE;
-  else
-    LF.lfPitchAndFamily := DEFAULT_PITCH;
+    else         LF.lfPitchAndFamily := DEFAULT_PITCH;
   end;
 
   // Create new font to use