diff --git a/components/exctrls/examples/ProgressBarEx/demo.lpi b/components/exctrls/examples/ProgressBarEx/demo.lpi
index 6b0dca462..5962e05e1 100644
--- a/components/exctrls/examples/ProgressBarEx/demo.lpi
+++ b/components/exctrls/examples/ProgressBarEx/demo.lpi
@@ -44,11 +44,6 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
-      <Unit>
-        <Filename Value="exprogressbar.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="ExProgressbar"/>
-      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/exctrls/exctrlspkg.lpk b/components/exctrls/exctrlspkg.lpk
index b392a73aa..85ba2ea3a 100644
--- a/components/exctrls/exctrlspkg.lpk
+++ b/components/exctrls/exctrlspkg.lpk
@@ -16,7 +16,8 @@
     <Description Value="Extended standard controls: 
 - CurrencyEdit, FloatSIEdit (supports SI units suffixes)
 - TRadioButton, TCheckbox, TRadioGroup and TCheckGroup: drawn by ThemeServices/Canvas, not by widgetset, button/text layout, wordwrap, user-provided check images
-- TColumnComboBoxEx"/>
+- TColumnComboBoxEx
+- TProgressBarEx"/>
     <License Value="LGPL with linking exception (like Lazarus LCL)."/>
     <Files Count="9">
       <Item1>
diff --git a/components/exctrls/source/exprogressbar.pas b/components/exctrls/source/exprogressbar.pas
index 6fe86f40c..4a52fbe89 100644
--- a/components/exctrls/source/exprogressbar.pas
+++ b/components/exctrls/source/exprogressbar.pas
@@ -76,6 +76,8 @@ type
     property ParentShowHint;
     property ShowHint;
     property Visible;
+
+    property OnPaint;
   end;
 
 implementation
@@ -86,6 +88,8 @@ uses
 constructor TProgressbarEx.Create(AOwner: TComponent);
 begin
   inherited;
+  ControlStyle := ControlStyle - [csSetCaption];
+
   FCaption := '';
   FColors[0] := DEFAULT_BACKCOLOR;
   FColors[1] := DEFAULT_BORDERCOLOR;
@@ -95,9 +99,12 @@ begin
   FMarqueeSpeed := DEFAULT_MARQUEESPEED;
   FMax := 100;
   FStyle := pbstNormal;
+
   FTimer := TTimer.Create(self);
   FTimer.Interval := 25;
   FTimer.OnTimer := @TimerHandler;
+  FTimer.Enabled := false;
+
   with GetControlClassDefaultSize do
     SetInitialBounds(0, 0, CX, CY);
 end;
@@ -303,6 +310,8 @@ begin
     else
       Canvas.TextOut((Width - txtSize.CY) div 2, R.Bottom - (Height - txtSize.CX) div 2, FCaption);
   end;
+
+  inherited;
 end;
 
 procedure TProgressbarEx.SetCaption(AValue: String);