diff --git a/utils/fppkg/fppkg.lpi b/utils/fppkg/fppkg.lpi
index 4aa7e6d495..1ca80bd4c2 100644
--- a/utils/fppkg/fppkg.lpi
+++ b/utils/fppkg/fppkg.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
@@ -9,14 +9,13 @@
         <MainUnitHasTitleStatement Value="False"/>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
@@ -31,490 +30,60 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="38">
+    <Units Count="8">
       <Unit0>
         <Filename Value="fppkg.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="fppkg"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="99"/>
-        <CursorPos X="61" Y="104"/>
-        <UsageCount Value="223"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="pkgropts.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pkgoptions"/>
-        <TopLine Value="1"/>
-        <CursorPos X="41" Y="18"/>
-        <UsageCount Value="223"/>
       </Unit1>
       <Unit2>
-        <Filename Value="fpmkcnst.inc"/>
-        <TopLine Value="1"/>
-        <CursorPos X="64" Y="8"/>
-        <UsageCount Value="59"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="fpmktype.pp"/>
-        <UnitName Value="fpmktype"/>
-        <TopLine Value="1"/>
-        <CursorPos X="3" Y="41"/>
-        <UsageCount Value="59"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="fpmkunit.pp"/>
-        <UnitName Value="fpmkunit"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="59"/>
-      </Unit4>
-      <Unit5>
         <Filename Value="fprepos.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="fprepos"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="245"/>
-        <CursorPos X="3" Y="245"/>
-        <UsageCount Value="223"/>
-      </Unit5>
-      <Unit6>
+      </Unit2>
+      <Unit3>
         <Filename Value="fpxmlrep.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="fpxmlrep"/>
-        <TopLine Value="43"/>
-        <CursorPos X="1" Y="43"/>
-        <UsageCount Value="223"/>
-      </Unit6>
-      <Unit7>
+      </Unit3>
+      <Unit4>
         <Filename Value="pkghandler.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pkghandler"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="182"/>
-        <CursorPos X="46" Y="212"/>
-        <UsageCount Value="223"/>
-        <Loaded Value="True"/>
-      </Unit7>
-      <Unit8>
+      </Unit4>
+      <Unit5>
         <Filename Value="pkgmkconv.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pkgmkconv"/>
-        <TopLine Value="29"/>
-        <CursorPos X="14" Y="53"/>
-        <UsageCount Value="223"/>
-      </Unit8>
-      <Unit9>
+      </Unit5>
+      <Unit6>
         <Filename Value="pkgdownload.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pkgDownload"/>
-        <EditorIndex Value="11"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="113"/>
-        <CursorPos X="24" Y="125"/>
-        <UsageCount Value="223"/>
-        <Loaded Value="True"/>
-      </Unit9>
-      <Unit10>
+      </Unit6>
+      <Unit7>
         <Filename Value="pkgmessages.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pkgmessages"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="36"/>
-        <CursorPos X="3" Y="54"/>
-        <UsageCount Value="223"/>
-        <Loaded Value="True"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="../../../fpc20/rtl/objpas/classes/classesh.inc"/>
-        <TopLine Value="580"/>
-        <CursorPos X="14" Y="599"/>
-        <UsageCount Value="19"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="../../../fpc20/rtl/inc/objpash.inc"/>
-        <TopLine Value="269"/>
-        <CursorPos X="38" Y="277"/>
-        <UsageCount Value="17"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="contnrs20.pp"/>
-        <UnitName Value="contnrs20"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="11"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="pkgcommands.pp"/>
-        <UnitName Value="pkgcommands"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="119"/>
-        <CursorPos X="70" Y="134"/>
-        <UsageCount Value="110"/>
-        <Loaded Value="True"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="pkgwget.pp"/>
-        <UnitName Value="pkgwget"/>
-        <TopLine Value="15"/>
-        <CursorPos X="18" Y="25"/>
-        <UsageCount Value="15"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="reptest.pp"/>
-        <UnitName Value="reptest"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
-        <UsageCount Value="8"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="rep2xml.lpr"/>
-        <UnitName Value="rep2xml"/>
-        <TopLine Value="217"/>
-        <CursorPos X="40" Y="228"/>
-        <UsageCount Value="8"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="pkgrepos.pp"/>
-        <UnitName Value="pkgrepos"/>
-        <EditorIndex Value="7"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="47"/>
-        <CursorPos X="1" Y="62"/>
-        <UsageCount Value="101"/>
-        <Loaded Value="True"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="zipper.pp"/>
-        <UnitName Value="zipper"/>
-        <TopLine Value="1303"/>
-        <CursorPos X="21" Y="1324"/>
-        <UsageCount Value="1"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="pkgfpmake.pp"/>
-        <UnitName Value="pkgfpmake"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="264"/>
-        <CursorPos X="38" Y="280"/>
-        <UsageCount Value="91"/>
-        <Loaded Value="True"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="pkglnet.pp"/>
-        <UnitName Value="pkglnet"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="71" Y="10"/>
-        <UsageCount Value="70"/>
-      </Unit21>
-      <Unit22>
-        <Filename Value="pkgoptions.pp"/>
-        <UnitName Value="pkgoptions"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="356"/>
-        <CursorPos X="1" Y="371"/>
-        <UsageCount Value="90"/>
-        <Bookmarks Count="2">
-          <Item0 X="1" Y="272" ID="2"/>
-          <Item1 X="1" Y="391" ID="1"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="pkgglobals.pp"/>
-        <UnitName Value="pkgglobals"/>
-        <EditorIndex Value="8"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="344"/>
-        <CursorPos X="37" Y="372"/>
-        <UsageCount Value="88"/>
-        <Loaded Value="True"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="../../rtl/objpas/sysutils/osutilsh.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="23"/>
-        <CursorPos X="10" Y="41"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="62"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit24>
-      <Unit25>
-        <Filename Value="../../rtl/unix/sysutils.pp"/>
-        <UnitName Value="sysutils"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1349"/>
-        <CursorPos X="3" Y="1353"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="62"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit25>
-      <Unit26>
-        <Filename Value="../../../lazarus/packager/packagesystem.pas"/>
-        <UnitName Value="PackageSystem"/>
-        <EditorIndex Value="5"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1296"/>
-        <CursorPos X="10" Y="1314"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit26>
-      <Unit27>
-        <Filename Value="../../rtl/objpas/sysutils/finah.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="7"/>
-        <CursorPos X="10" Y="39"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit27>
-      <Unit28>
-        <Filename Value="../../../lazarus/packager/basepkgmanager.pas"/>
-        <UnitName Value="BasePkgManager"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="229"/>
-        <CursorPos X="37" Y="247"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="27"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit28>
-      <Unit29>
-        <Filename Value="../../../lazarus/ide/frames/files_options.pas"/>
-        <ComponentName Value="FilesOptionsFrame"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="files_options"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="297"/>
-        <CursorPos X="27" Y="319"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit29>
-      <Unit30>
-        <Filename Value="../../../lazarus/ide/environmentopts.pp"/>
-        <UnitName Value="EnvironmentOpts"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1460"/>
-        <CursorPos X="66" Y="1478"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit30>
-      <Unit31>
-        <Filename Value="../../../lazarus/components/codetools/fileprocs.pas"/>
-        <UnitName Value="FileProcs"/>
-        <EditorIndex Value="6"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="966"/>
-        <CursorPos X="26" Y="969"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit31>
-      <Unit32>
-        <Filename Value="../../../lazarus/components/chmhelp/packages/idehelp/lazchmhelp.pas"/>
-        <UnitName Value="LazChmHelp"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="176"/>
-        <CursorPos X="31" Y="194"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit32>
-      <Unit33>
-        <Filename Value="../../../lazarus/test/bugs/testfileproc.pas"/>
-        <UnitName Value="testfileproc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="19"/>
-        <CursorPos X="14" Y="45"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit33>
-      <Unit34>
-        <Filename Value="../../../lazarus/ide/transfermacros.pp"/>
-        <UnitName Value="TransferMacros"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="40" Y="19"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="27"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="../../packages/fcl-web/src/fptemplate.pp"/>
-        <UnitName Value="fpTemplate"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="56"/>
-        <CursorPos X="1" Y="69"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="../../packages/fcl-base/src/inifiles.pp"/>
-        <UnitName Value="IniFiles"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="163"/>
-        <CursorPos X="14" Y="178"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="../../rtl/objpas/sysutils/osutil.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="66"/>
-        <CursorPos X="40" Y="75"/>
-        <SyntaxHighlighter Value="FreePascal"/>
-        <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Text"/>
-      </Unit37>
+      </Unit7>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="177" Column="16" TopLine="161"/>
-      </Position1>
-      <Position2>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="178" Column="16" TopLine="161"/>
-      </Position2>
-      <Position3>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="184" Column="16" TopLine="161"/>
-      </Position3>
-      <Position4>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="194" Column="30" TopLine="179"/>
-      </Position4>
-      <Position5>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="195" Column="30" TopLine="179"/>
-      </Position5>
-      <Position6>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="196" Column="30" TopLine="179"/>
-      </Position6>
-      <Position7>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="197" Column="30" TopLine="179"/>
-      </Position7>
-      <Position8>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="232" Column="16" TopLine="217"/>
-      </Position8>
-      <Position9>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="271" Column="1" TopLine="256"/>
-      </Position9>
-      <Position10>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="326" Column="1" TopLine="311"/>
-      </Position10>
-      <Position11>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="390" Column="16" TopLine="375"/>
-      </Position11>
-      <Position12>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="391" Column="16" TopLine="375"/>
-      </Position12>
-      <Position13>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="392" Column="16" TopLine="375"/>
-      </Position13>
-      <Position14>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="393" Column="16" TopLine="375"/>
-      </Position14>
-      <Position15>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="398" Column="16" TopLine="375"/>
-      </Position15>
-      <Position16>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="409" Column="30" TopLine="394"/>
-      </Position16>
-      <Position17>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="62" Column="1" TopLine="39"/>
-      </Position17>
-      <Position18>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="94" Column="15" TopLine="79"/>
-      </Position18>
-      <Position19>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="119" Column="23" TopLine="104"/>
-      </Position19>
-      <Position20>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="163" Column="40" TopLine="148"/>
-      </Position20>
-      <Position21>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="410" Column="53" TopLine="395"/>
-      </Position21>
-      <Position22>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="425" Column="19" TopLine="410"/>
-      </Position22>
-      <Position23>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="453" Column="16" TopLine="438"/>
-      </Position23>
-      <Position24>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="454" Column="23" TopLine="438"/>
-      </Position24>
-      <Position25>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="453" Column="23" TopLine="438"/>
-      </Position25>
-      <Position26>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="454" Column="23" TopLine="438"/>
-      </Position26>
-      <Position27>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="516" Column="75" TopLine="494"/>
-      </Position27>
-      <Position28>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="393" Column="1" TopLine="378"/>
-      </Position28>
-      <Position29>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="325" Column="1" TopLine="310"/>
-      </Position29>
-      <Position30>
-        <Filename Value="pkgoptions.pp"/>
-        <Caret Line="371" Column="1" TopLine="356"/>
-      </Position30>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="9"/>
     <SearchPaths>
-      <IncludeFiles Value="lnet/sys/"/>
-      <OtherUnitFiles Value="lnet/"/>
+      <IncludeFiles Value="lnet/sys"/>
+      <OtherUnitFiles Value="lnet"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <Checks>
         <IOChecks Value="True"/>
@@ -535,17 +104,14 @@
       <Verbosity>
         <ShowHints Value="False"/>
       </Verbosity>
-      <CustomOptions Value="-FE.
-"/>
+      <CompilerMessages>
+        <UseMsgFile Value="True"/>
+      </CompilerMessages>
+      <CustomOptions Value="-FE."/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
   <Debugging>
-    <Watches Count="1">
-      <Item1>
-        <Expression Value="builddir"/>
-      </Item1>
-    </Watches>
     <Exceptions Count="2">
       <Item1>
         <Name Value="ECodetoolError"/>