diff --git a/components/lazautoupdate/latest_stable/lazupdate.lpk b/components/lazautoupdate/latest_stable/lazupdate.lpk
index 34b541364..6d252bfef 100644
--- a/components/lazautoupdate/latest_stable/lazupdate.lpk
+++ b/components/lazautoupdate/latest_stable/lazupdate.lpk
@@ -12,7 +12,13 @@
         <IncludeFiles Value="synapse\source\lib"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <IncludeAssertionCode Value="True"/>
+        </SyntaxOptions>
+      </Parsing>
       <CodeGeneration>
+        <SmartLinkUnit Value="True"/>
         <Optimizations>
           <OptimizationLevel Value="3"/>
         </Optimizations>
@@ -55,7 +61,7 @@ More information in the Wiki Home Page http://wiki.freepascal.org/LazAutoUpdater
   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" Release="5"/>
+    <Version Minor="2" Release="6"/>
     <Files Count="6">
       <Item1>
         <Filename Value="ulazautoupdate.pas"/>
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.lps b/components/lazautoupdate/latest_stable/testapp/testapp.lps
index 8974767d5..9459bcf34 100644
--- a/components/lazautoupdate/latest_stable/testapp/testapp.lps
+++ b/components/lazautoupdate/latest_stable/testapp/testapp.lps
@@ -10,7 +10,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
         <CursorPos X="33" Y="27"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="50"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -21,7 +21,7 @@
         <ResourceBaseClass Value="Form"/>
         <TopLine Value="64"/>
         <CursorPos X="19" Y="103"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="50"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -32,26 +32,27 @@
         <WindowIndex Value="1"/>
         <TopLine Value="3"/>
         <CursorPos X="76" Y="8"/>
-        <UsageCount Value="30"/>
+        <UsageCount Value="33"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\lazautoupdate_httpclient.pas"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="97" Y="12"/>
-        <UsageCount Value="23"/>
+        <UsageCount Value="22"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\ulazautoupdate.pas"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <CursorPos X="40" Y="10"/>
+        <TopLine Value="45"/>
+        <CursorPos X="42" Y="72"/>
         <ExtraEditorCount Value="2"/>
         <ExtraEditor1>
           <IsVisibleTab Value="True"/>
           <WindowIndex Value="1"/>
-          <TopLine Value="578"/>
-          <CursorPos Y="587"/>
+          <TopLine Value="389"/>
+          <CursorPos X="41" Y="399"/>
         </ExtraEditor1>
         <ExtraEditor2>
           <EditorIndex Value="-1"/>
@@ -59,7 +60,7 @@
           <TopLine Value="-1"/>
           <CursorPos X="-1" Y="-1"/>
         </ExtraEditor2>
-        <UsageCount Value="23"/>
+        <UsageCount Value="24"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -68,20 +69,20 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="101"/>
         <CursorPos Y="154"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\..\applications\foobot\monitor\foobot_sensors.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="76"/>
         <CursorPos X="75" Y="77"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\..\..\applications\foobot\foobot.lpr"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="21"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit7>
       <Unit8>
         <Filename Value="C:\trunklatest\lazarus\lcl\asyncprocess.pp"/>
@@ -89,27 +90,27 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="22"/>
         <CursorPos X="31" Y="31"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit8>
       <Unit9>
         <Filename Value="C:\trunklatest\lazarus\components\lazutils\utf8process.pp"/>
         <UnitName Value="UTF8Process"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="3" Y="85"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit9>
       <Unit10>
         <Filename Value="..\..\..\..\applications\foobot\monitor\umainform.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="25"/>
         <CursorPos X="22" Y="36"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="20"/>
       </Unit10>
       <Unit11>
         <Filename Value="C:\trunklatest\fpc\rtl\objpas\sysutils\osutilsh.inc"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="10" Y="20"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
         <Filename Value="..\versionsupport.pas"/>
@@ -117,28 +118,28 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="4"/>
         <CursorPos X="8" Y="31"/>
-        <UsageCount Value="18"/>
+        <UsageCount Value="17"/>
       </Unit12>
       <Unit13>
         <Filename Value="C:\laztrunk\fpc\examples\httpd22\minimain.pas"/>
         <EditorIndex Value="-1"/>
         <WindowIndex Value="1"/>
         <TopLine Value="3"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit13>
       <Unit14>
         <Filename Value="..\uappisrunning.pas"/>
         <EditorIndex Value="-1"/>
         <WindowIndex Value="1"/>
         <TopLine Value="124"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\..\..\cryptini\latest_stable\ucryptini.pas"/>
         <EditorIndex Value="-1"/>
         <WindowIndex Value="1"/>
         <TopLine Value="372"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit15>
       <Unit16>
         <Filename Value="..\updatehmsource\updatehm.lpr"/>
@@ -146,7 +147,7 @@
         <WindowIndex Value="1"/>
         <TopLine Value="35"/>
         <CursorPos X="40" Y="51"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit16>
       <Unit17>
@@ -155,129 +156,129 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="24"/>
         <CursorPos Y="33"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit17>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\open_ssl.pas"/>
-        <Caret Line="25"/>
+        <Caret Line="26" Column="8" TopLine="2"/>
       </Position1>
       <Position2>
         <Filename Value="..\open_ssl.pas"/>
-        <Caret Line="26" Column="8" TopLine="2"/>
+        <Caret Line="16" TopLine="3"/>
       </Position2>
       <Position3>
         <Filename Value="..\open_ssl.pas"/>
-        <Caret Line="16" TopLine="3"/>
+        <Caret Line="26" Column="2" TopLine="5"/>
       </Position3>
       <Position4>
-        <Filename Value="..\open_ssl.pas"/>
-        <Caret Line="26" Column="2" TopLine="5"/>
+        <Filename Value="..\ulazautoupdate.pas"/>
+        <Caret Line="56" Column="27" TopLine="28"/>
       </Position4>
       <Position5>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="56" Column="27" TopLine="28"/>
+        <Caret Line="52" Column="19" TopLine="28"/>
       </Position5>
       <Position6>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="52" Column="19" TopLine="28"/>
+        <Caret Line="56" Column="19" TopLine="28"/>
       </Position6>
       <Position7>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="56" Column="19" TopLine="28"/>
+        <Caret Line="926" Column="38" TopLine="889"/>
       </Position7>
       <Position8>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="926" Column="38" TopLine="889"/>
+        <Caret Line="55" Column="27" TopLine="29"/>
       </Position8>
       <Position9>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="55" Column="27" TopLine="29"/>
+        <Caret Line="926" Column="38" TopLine="892"/>
       </Position9>
       <Position10>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="926" Column="38" TopLine="892"/>
+        <Caret Line="1083" Column="39" TopLine="1045"/>
       </Position10>
       <Position11>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1083" Column="39" TopLine="1045"/>
+        <Caret Line="51" Column="22" TopLine="28"/>
       </Position11>
       <Position12>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="51" Column="22" TopLine="28"/>
+        <Caret Line="52" Column="19" TopLine="28"/>
       </Position12>
       <Position13>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="52" Column="19" TopLine="28"/>
+        <Caret Line="55" Column="19" TopLine="28"/>
       </Position13>
       <Position14>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="55" Column="19" TopLine="28"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="53" Column="103" TopLine="32"/>
       </Position14>
       <Position15>
         <Filename Value="umainform.pas"/>
-        <Caret Line="53" Column="103" TopLine="32"/>
+        <Caret Line="82" Column="9" TopLine="47"/>
       </Position15>
       <Position16>
         <Filename Value="umainform.pas"/>
-        <Caret Line="82" Column="9" TopLine="47"/>
+        <Caret Line="89" Column="30" TopLine="58"/>
       </Position16>
       <Position17>
         <Filename Value="umainform.pas"/>
-        <Caret Line="89" Column="30" TopLine="58"/>
+        <Caret Line="15" Column="23"/>
       </Position17>
       <Position18>
         <Filename Value="umainform.pas"/>
-        <Caret Line="15" Column="23"/>
+        <Caret Line="79" Column="26" TopLine="53"/>
       </Position18>
       <Position19>
         <Filename Value="umainform.pas"/>
-        <Caret Line="79" Column="26" TopLine="53"/>
+        <Caret Line="157" Column="94" TopLine="115"/>
       </Position19>
       <Position20>
         <Filename Value="umainform.pas"/>
-        <Caret Line="157" Column="94" TopLine="115"/>
+        <Caret Line="95" TopLine="64"/>
       </Position20>
       <Position21>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="95" TopLine="64"/>
+        <Filename Value="..\ulazautoupdate.pas"/>
+        <Caret Line="518" Column="16" TopLine="483"/>
       </Position21>
       <Position22>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="518" Column="16" TopLine="483"/>
+        <Caret Line="1823" Column="4" TopLine="1796"/>
       </Position22>
       <Position23>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1823" Column="4" TopLine="1796"/>
+        <Caret Line="577" Column="7" TopLine="544"/>
       </Position23>
       <Position24>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="577" Column="7" TopLine="544"/>
+        <Caret Line="539" Column="7" TopLine="516"/>
       </Position24>
       <Position25>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="539" Column="7" TopLine="516"/>
+        <Caret Line="331" Column="71" TopLine="300"/>
       </Position25>
       <Position26>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="331" Column="71" TopLine="300"/>
+        <Caret Line="1869" TopLine="1830"/>
       </Position26>
       <Position27>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1869" TopLine="1830"/>
+        <Caret Line="228" Column="23" TopLine="199"/>
       </Position27>
       <Position28>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="228" Column="23" TopLine="199"/>
+        <Caret Line="331" Column="88" TopLine="309"/>
       </Position28>
       <Position29>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="331" Column="88" TopLine="309"/>
+        <Caret Line="1514" TopLine="1489"/>
       </Position29>
       <Position30>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1514" TopLine="1489"/>
+        <Caret Line="61" Column="80" TopLine="37"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/components/lazautoupdate/latest_stable/testapp/umainform.lfm b/components/lazautoupdate/latest_stable/testapp/umainform.lfm
index 609313cf5..3f4bbd219 100644
--- a/components/lazautoupdate/latest_stable/testapp/umainform.lfm
+++ b/components/lazautoupdate/latest_stable/testapp/umainform.lfm
@@ -126,7 +126,7 @@ object mainform: Tmainform
     ZipfileName = 'testapp.zip'
     GitHubProjectname = 'lazarusccr'
     GitHubRepositoryName = 'TestApp'
-    GitHubBranch = 'TestBranch'
+    GitHubBranchOrTag = 'updates'
     Left = 200
     Top = 24
   end
diff --git a/components/lazautoupdate/latest_stable/ulazautoupdate.pas b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
index 006f2592f..e4cdcaba7 100644
--- a/components/lazautoupdate/latest_stable/ulazautoupdate.pas
+++ b/components/lazautoupdate/latest_stable/ulazautoupdate.pas
@@ -57,8 +57,11 @@ const
   //  GitHubUserName,GitHubProjectName,updatepath,filename
   C_GITHUBFILE_URL_UPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s';
   // https://raw.github.com/<username>/<repo>/<branch>/some_directory/file
+  C_GITHUBFILE_URL_TAGUPDATES = 'https://raw.github.com/%s/%s/%s/%s/%s';
+  // https://github.com/lazarusccr/TestApp/blob/updates/updates/testapplinux32.ini
+  // https://raw.github.com/<username>/<repo>/<branch>/some_directory/file
 
-  C_TLazAutoUpdateComponentVersion = '0.2.5';
+  C_TLazAutoUpdateComponentVersion = '0.2.6';
   C_LAUTRayINI = 'lauimport.ini';
 
 {
@@ -396,7 +399,7 @@ type
     // Name of your GitHub repository within the project/username
     Property GitHubRepositoryName:String read fGitHubRepositoryName write fGitHubRepositoryName;
     // Default=master but any branchname is OK
-    Property GitHubBranch:String read fGitHubBranch write fGitHubBranch;
+    Property GitHubBranchOrTag:String read fGitHubBranch write fGitHubBranch;
   end;
 
   {TThreadedDownload }
diff --git a/components/lazautoupdate/latest_stable/updates/lazautoupdate.zip b/components/lazautoupdate/latest_stable/updates/lazautoupdate.zip
index b4c42613c..a049a3780 100644
Binary files a/components/lazautoupdate/latest_stable/updates/lazautoupdate.zip and b/components/lazautoupdate/latest_stable/updates/lazautoupdate.zip differ
diff --git a/components/lazautoupdate/latest_stable/updates/update_lazautoupdate.json b/components/lazautoupdate/latest_stable/updates/update_lazautoupdate.json
index a7d3439e2..ba4034aa0 100644
--- a/components/lazautoupdate/latest_stable/updates/update_lazautoupdate.json
+++ b/components/lazautoupdate/latest_stable/updates/update_lazautoupdate.json
@@ -9,7 +9,7 @@
       "ForceNotify" : false,
       "InternalVersion" : 2,
       "Name" : "lazupdate.lpk",
-      "Version" : "0.2.5.0"
+      "Version" : "0.2.6.0"
     }
   ]
 }