diff --git a/components/lazautoupdate/latest_stable/lazupdate.lpk b/components/lazautoupdate/latest_stable/lazupdate.lpk
index 2c45146fb..61ed95ab9 100644
--- a/components/lazautoupdate/latest_stable/lazupdate.lpk
+++ b/components/lazautoupdate/latest_stable/lazupdate.lpk
@@ -52,7 +52,7 @@ A component for SourceForge Project Developers and end-users to update their app
   along with this library; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 "/>
-    <Version Minor="2"/>
+    <Version Minor="2" Release="1"/>
     <Files Count="5">
       <Item1>
         <Filename Value="ulazautoupdate.pas"/>
diff --git a/components/lazautoupdate/latest_stable/lazupdate.pas b/components/lazautoupdate/latest_stable/lazupdate.pas
index 5c88de6b7..7f74b2c1a 100644
--- a/components/lazautoupdate/latest_stable/lazupdate.pas
+++ b/components/lazautoupdate/latest_stable/lazupdate.pas
@@ -4,7 +4,6 @@
 
 unit lazupdate;
 
-{$warn 5023 off : no warning about unused units}
 interface
 
 uses
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.lps b/components/lazautoupdate/latest_stable/testapp/testapp.lps
index 36c1def36..bb024ee24 100644
--- a/components/lazautoupdate/latest_stable/testapp/testapp.lps
+++ b/components/lazautoupdate/latest_stable/testapp/testapp.lps
@@ -2,15 +2,15 @@
 <CONFIG>
   <ProjectSession>
     <PathDelim Value="\"/>
-    <Version Value="10"/>
+    <Version Value="9"/>
     <BuildModes Active="Win32"/>
-    <Units Count="11">
+    <Units Count="12">
       <Unit0>
         <Filename Value="testapp.lpr"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
         <CursorPos X="33" Y="27"/>
-        <UsageCount Value="29"/>
+        <UsageCount Value="31"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -21,7 +21,7 @@
         <ResourceBaseClass Value="Form"/>
         <TopLine Value="88"/>
         <CursorPos X="43" Y="108"/>
-        <UsageCount Value="29"/>
+        <UsageCount Value="31"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -30,15 +30,15 @@
         <EditorIndex Value="2"/>
         <TopLine Value="251"/>
         <CursorPos X="27" Y="282"/>
-        <UsageCount Value="14"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\ulazautoupdate.pas"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
-        <TopLine Value="334"/>
-        <CursorPos X="34" Y="358"/>
+        <TopLine Value="212"/>
+        <CursorPos X="8" Y="233"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <IsVisibleTab Value="True"/>
@@ -46,7 +46,7 @@
           <TopLine Value="1743"/>
           <CursorPos X="63" Y="1782"/>
         </ExtraEditor1>
-        <UsageCount Value="14"/>
+        <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -90,7 +90,7 @@
         <EditorIndex Value="1"/>
         <TopLine Value="25"/>
         <CursorPos X="25" Y="55"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -99,127 +99,136 @@
         <CursorPos X="10" Y="20"/>
         <UsageCount Value="11"/>
       </Unit10>
+      <Unit11>
+        <Filename Value="..\versionsupport.pas"/>
+        <UnitName Value="VersionSupport"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="25"/>
+        <CursorPos X="71" Y="44"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit11>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="47" Column="34" TopLine="21"/>
+        <Caret Line="1651" Column="39" TopLine="1637"/>
       </Position1>
       <Position2>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1722" Column="21" TopLine="1702"/>
+        <Caret Line="1652" Column="42" TopLine="1626"/>
       </Position2>
       <Position3>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1763" Column="53" TopLine="1733"/>
+        <Caret Line="1663" Column="16" TopLine="1638"/>
       </Position3>
       <Position4>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1651" Column="39" TopLine="1637"/>
+        <Caret Line="1730" Column="5" TopLine="1698"/>
       </Position4>
       <Position5>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1652" Column="42" TopLine="1626"/>
+        <Caret Line="47" Column="27"/>
       </Position5>
       <Position6>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1663" Column="16" TopLine="1638"/>
+        <Caret Line="1355" Column="25" TopLine="1330"/>
       </Position6>
       <Position7>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1730" Column="5" TopLine="1698"/>
+        <Caret Line="1361" Column="14" TopLine="1319"/>
       </Position7>
       <Position8>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="47" Column="27"/>
+        <Caret Line="1360" Column="49" TopLine="1337"/>
       </Position8>
       <Position9>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1355" Column="25" TopLine="1330"/>
+        <Caret Line="1354" Column="15" TopLine="1330"/>
       </Position9>
       <Position10>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1361" Column="14" TopLine="1319"/>
+        <Caret Line="1670" Column="5" TopLine="1646"/>
       </Position10>
       <Position11>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1360" Column="49" TopLine="1337"/>
+        <Caret Line="1354" Column="16" TopLine="1330"/>
       </Position11>
       <Position12>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1354" Column="15" TopLine="1330"/>
+        <Caret Line="1361" Column="15" TopLine="1337"/>
       </Position12>
       <Position13>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1670" Column="5" TopLine="1646"/>
+        <Caret Line="1354" Column="17" TopLine="1330"/>
       </Position13>
       <Position14>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1354" Column="16" TopLine="1330"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="9" Column="11"/>
       </Position14>
       <Position15>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1361" Column="15" TopLine="1337"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="117" Column="65" TopLine="93"/>
       </Position15>
       <Position16>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1354" Column="17" TopLine="1330"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="114" TopLine="91"/>
       </Position16>
       <Position17>
         <Filename Value="umainform.pas"/>
-        <Caret Line="9" Column="11"/>
+        <Caret Line="113" TopLine="90"/>
       </Position17>
       <Position18>
         <Filename Value="umainform.pas"/>
-        <Caret Line="117" Column="65" TopLine="93"/>
+        <Caret Line="88" TopLine="86"/>
       </Position18>
       <Position19>
         <Filename Value="umainform.pas"/>
-        <Caret Line="114" TopLine="91"/>
+        <Caret Line="87" TopLine="85"/>
       </Position19>
       <Position20>
         <Filename Value="umainform.pas"/>
-        <Caret Line="113" TopLine="90"/>
+        <Caret Line="45" TopLine="30"/>
       </Position20>
       <Position21>
         <Filename Value="umainform.pas"/>
-        <Caret Line="88" TopLine="86"/>
+        <Caret Line="78" Column="29" TopLine="58"/>
       </Position21>
       <Position22>
         <Filename Value="umainform.pas"/>
-        <Caret Line="87" TopLine="85"/>
+        <Caret Line="77" Column="6" TopLine="53"/>
       </Position22>
       <Position23>
         <Filename Value="umainform.pas"/>
-        <Caret Line="45" TopLine="30"/>
+        <Caret Line="73" Column="48" TopLine="53"/>
       </Position23>
       <Position24>
         <Filename Value="umainform.pas"/>
-        <Caret Line="78" Column="29" TopLine="58"/>
+        <Caret Line="75" Column="48" TopLine="55"/>
       </Position24>
       <Position25>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="77" Column="6" TopLine="53"/>
-      </Position25>
-      <Position26>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="73" Column="48" TopLine="53"/>
-      </Position26>
-      <Position27>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="75" Column="48" TopLine="55"/>
-      </Position27>
-      <Position28>
         <Filename Value="..\ulazautoupdate.pas"/>
         <Caret Line="7" Column="17"/>
+      </Position25>
+      <Position26>
+        <Filename Value="..\ulazautoupdate.pas"/>
+        <Caret Line="359" Column="29" TopLine="341"/>
+      </Position26>
+      <Position27>
+        <Filename Value="..\ulazautoupdate.pas"/>
+        <Caret Line="357" Column="58" TopLine="352"/>
+      </Position27>
+      <Position28>
+        <Filename Value="..\versionsupport.pas"/>
+        <Caret Line="59" Column="58" TopLine="19"/>
       </Position28>
       <Position29>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="359" Column="29" TopLine="341"/>
+        <Caret Line="62" Column="33" TopLine="29"/>
       </Position29>
       <Position30>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="357" Column="58" TopLine="352"/>
+        <Caret Line="216" Column="13" TopLine="192"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.res b/components/lazautoupdate/latest_stable/testapp/testapp.res
index 2feb20d57..21810644f 100644
Binary files a/components/lazautoupdate/latest_stable/testapp/testapp.res and b/components/lazautoupdate/latest_stable/testapp/testapp.res differ
diff --git a/components/lazautoupdate/latest_stable/ulazautoupdate.pas b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
index ba3f52567..6df7ebedd 100644
--- a/components/lazautoupdate/latest_stable/ulazautoupdate.pas
+++ b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
@@ -212,7 +212,9 @@ type
     fGUIOnlineVersion: string;
     fShowDialogs: boolean;
     fDownloadInprogress: boolean;
-    FUpdateHMProcess: TAsyncProcess;
+    {$IFDEF UNIX}
+      FUpdateHMProcess: TAsyncProcess;
+    {$ENDIF}
     fauOtherSourceURL: string;
     fauOtherSourceFilename: string;
     WhatsNewForm: TForm;
@@ -228,7 +230,7 @@ type
     fDebugMode, fFireDebugEvent: boolean;
     fSilentMode: boolean;
     fLCLVersion, fWidgetSet, fFPCVersion, fLastCompiled, fTargetOS: string;
-    fQuad: TVersionQuad;
+    // fQuad: TVersionQuad;
     fProgVersion: TProgramVersion;
     objFileVerInfo: TFileVersionInfo;
     fUpdateExe,fUpdateSilentExe:String;
@@ -861,8 +863,6 @@ begin
   // Test: Is the online version newer?
   if NewerVersion(fGUIQuad, fApplicationVersionQuad) then
     Result := True;
-  //  if (iGUIVersion > fApplicationVersionQuad) then
-  //    Result := True;
 end;
 
 
diff --git a/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux32/updatehmlinux32 b/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux32/updatehmlinux32
index d894557c5..f608cb5a7 100644
Binary files a/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux32/updatehmlinux32 and b/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux32/updatehmlinux32 differ
diff --git a/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux64/updatehmlinux64 b/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux64/updatehmlinux64
index fb7c9ebea..a5e4d046b 100644
Binary files a/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux64/updatehmlinux64 and b/components/lazautoupdate/latest_stable/updatehmsource/compiled/linux64/updatehmlinux64 differ
diff --git a/components/lazautoupdate/latest_stable/updatehmsource/compiled/win32/updatehmwin32.exe b/components/lazautoupdate/latest_stable/updatehmsource/compiled/win32/updatehmwin32.exe
index 11609f79e..edaff0139 100644
Binary files a/components/lazautoupdate/latest_stable/updatehmsource/compiled/win32/updatehmwin32.exe and b/components/lazautoupdate/latest_stable/updatehmsource/compiled/win32/updatehmwin32.exe differ
diff --git a/components/lazautoupdate/latest_stable/updatehmsource/compiled/win64/updatehmwin64.exe b/components/lazautoupdate/latest_stable/updatehmsource/compiled/win64/updatehmwin64.exe
index a32029b5a..12bef1576 100644
Binary files a/components/lazautoupdate/latest_stable/updatehmsource/compiled/win64/updatehmwin64.exe and b/components/lazautoupdate/latest_stable/updatehmsource/compiled/win64/updatehmwin64.exe differ
diff --git a/components/lazautoupdate/latest_stable/updatehmsource/updatehm.lps b/components/lazautoupdate/latest_stable/updatehmsource/updatehm.lps
index a672b489e..42874842c 100644
--- a/components/lazautoupdate/latest_stable/updatehmsource/updatehm.lps
+++ b/components/lazautoupdate/latest_stable/updatehmsource/updatehm.lps
@@ -9,7 +9,7 @@
         <Filename Value="updatehm.lpr"/>
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="132"/>
+        <TopLine Value="36"/>
         <CursorPos X="41" Y="144"/>
         <UsageCount Value="76"/>
         <Loaded Value="True"/>
diff --git a/components/lazautoupdate/latest_stable/versionsupport.pas b/components/lazautoupdate/latest_stable/versionsupport.pas
index c5acc0fb4..b7b266e66 100644
--- a/components/lazautoupdate/latest_stable/versionsupport.pas
+++ b/components/lazautoupdate/latest_stable/versionsupport.pas
@@ -31,7 +31,7 @@ Interface
 *)
 
 Uses
-  Classes, SysUtils;
+  Classes, SysUtils,LCLVersion;
 
 Function GetFileVersion: String;
 Function GetProductVersion: String;
@@ -56,7 +56,7 @@ Const
 Implementation
 
 Uses
-  resource, versiontypes, versionresource, LCLVersion, InterfaceBase;
+  resource, versiontypes, versionresource, InterfaceBase;
 
 Type
   TVersionInfo = Class