diff --git a/sources/fpcup.ini b/sources/fpcup.ini
index cd7bbdf3..6e5c84dc 100644
--- a/sources/fpcup.ini
+++ b/sources/fpcup.ini
@@ -19,7 +19,7 @@
 ; ... and you can define your own, like below:
 
 [fpcupinfo]
-inifileversion=2.2.8.0
+inifileversion=4.0.0.1
 
 [ALIASfpcURL]
 stable.git=https://github.com/LongDirtyAnimAlf/fpcsource_3_2_2.git
@@ -1870,7 +1870,8 @@ Description="ESS-Model is a powerful, reverse engine, UML-tool for Pascal and Ja
 Category=tools
 Installdir=$(basedir)/ccr/$(name)
 Enabled=0
-GITURL=https://github.com/JuhaManninen/Laz-Model
+;GITURL=https://github.com/JuhaManninen/Laz-Model
+GITURL=https://github.com/iLya2IK/Laz-Model
 ;ArchiveURL=https://sourceforge.net/projects/essmodelforlaza/files/latest/download
 ;ArchiveURL=https://sourceforge.net/code-snapshots/svn/e/es/essmodelforlaza/code/essmodelforlaza-code-r78-branches-essmodel_3.1_refactoring.zip
 UnInstall=rm -Rf $(Installdir)
diff --git a/sources/installerfpc.pas b/sources/installerfpc.pas
index 44f19ab2..7ef70b79 100644
--- a/sources/installerfpc.pas
+++ b/sources/installerfpc.pas
@@ -1186,14 +1186,15 @@ function TFPCCrossInstaller.BuildModuleCustom(ModuleName: string): boolean;
 
           //Still not clear if jobs can be enabled for crosscompiler builds ... :-|
           //However, on Windows, erroros occur frequently due to more jobs.
-          //So, again, disabling for the time being.
-          {
-          if (NOT FNoJobs) then
+          //So, again, disabling for the time being, except for building the packages.
+          if (MakeCycle in [st_PackagesBuild,st_PackagesInstall]) then
           begin
-            Processor.SetParamNameData('--jobs',IntToStr(FCPUCount));
-            Processor.SetParamNameData('FPMAKEOPT','--threads='+IntToStr(FCPUCount));
+            if (NOT FNoJobs) then
+            begin
+              Processor.SetParamNameData('--jobs',IntToStr(FCPUCount));
+              Processor.SetParamNameData('FPMAKEOPT','--threads='+IntToStr(FCPUCount));
+            end;
           end;
-          }
 
           Processor.SetParamNameData('--directory',SourceDirectory);