diff --git a/components/fpspreadsheet/examples/excel5demo/excel5demo.lpi b/components/fpspreadsheet/examples/excel5demo/excel5demo.lpi
index 0fb956a7e..c1f160d4e 100755
--- a/components/fpspreadsheet/examples/excel5demo/excel5demo.lpi
+++ b/components/fpspreadsheet/examples/excel5demo/excel5demo.lpi
@@ -5,9 +5,8 @@
     <Version Value="6"/>
     <General>
       <MainUnit Value="0"/>
-      <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <ActiveEditorIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -26,15 +25,20 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
+    <RequiredPackages Count="1">
+      <Item1>
+        <PackageName Value="laz_fpspreadsheet"/>
+      </Item1>
+    </RequiredPackages>
     <Units Count="15">
       <Unit0>
         <Filename Value="excel5demo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="excel5demo"/>
-        <CursorPos X="5" Y="12"/>
-        <TopLine Value="1"/>
+        <CursorPos X="64" Y="13"/>
+        <TopLine Value="3"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="49"/>
+        <UsageCount Value="50"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -42,21 +46,17 @@
         <UnitName Value="fpspreadsheet"/>
         <CursorPos X="32" Y="414"/>
         <TopLine Value="388"/>
-        <EditorIndex Value="1"/>
         <UsageCount Value="25"/>
-        <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\xlsbiff5.pas"/>
         <UnitName Value="xlsbiff5"/>
         <CursorPos X="16" Y="320"/>
         <TopLine Value="300"/>
-        <EditorIndex Value="4"/>
         <UsageCount Value="25"/>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="C:\Programas\FPC220\source\packages\base\winunits\activex.pp"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\packages\base\winunits\activex.pp"/>
         <UnitName Value="ActiveX"/>
         <CursorPos X="27" Y="29"/>
         <TopLine Value="6"/>
@@ -67,12 +67,10 @@
         <UnitName Value="fpolestorage"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="5"/>
         <UsageCount Value="45"/>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="C:\Programas\FPC220\source\rtl\inc\objpash.inc"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\rtl\inc\objpash.inc"/>
         <CursorPos X="21" Y="141"/>
         <TopLine Value="131"/>
         <UsageCount Value="9"/>
@@ -82,168 +80,93 @@
         <UnitName Value="xlsbiff2"/>
         <CursorPos X="20" Y="277"/>
         <TopLine Value="260"/>
-        <EditorIndex Value="2"/>
         <UsageCount Value="18"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
-        <Filename Value="C:\Programas\FPC220\source\rtl\objpas\classes\classesh.inc"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\rtl\objpas\classes\classesh.inc"/>
         <CursorPos X="22" Y="1602"/>
         <TopLine Value="1598"/>
         <UsageCount Value="11"/>
       </Unit7>
       <Unit8>
-        <Filename Value="C:\Programas\FPC220\source\rtl\win32\buildrtl.pp"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\rtl\win32\buildrtl.pp"/>
         <UnitName Value="buildrtl"/>
         <CursorPos X="29" Y="5"/>
         <TopLine Value="1"/>
         <UsageCount Value="9"/>
       </Unit8>
       <Unit9>
-        <Filename Value="C:\Programas\FPC220\source\rtl\objpas\fgl.pp"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\rtl\objpas\fgl.pp"/>
         <UnitName Value="fgl"/>
         <CursorPos X="15" Y="86"/>
         <TopLine Value="55"/>
-        <EditorIndex Value="7"/>
         <UsageCount Value="18"/>
-        <Loaded Value="True"/>
       </Unit9>
       <Unit10>
-        <Filename Value="C:\Programas\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
         <UnitName Value="Win32WSStdCtrls"/>
         <CursorPos X="11" Y="737"/>
         <TopLine Value="713"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="14"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
-        <Filename Value="C:\Programas\lazarus\lcl\interfaces\win32\win32wscontrols.pp"/>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\interfaces\win32\win32wscontrols.pp"/>
         <UnitName Value="Win32WSControls"/>
         <CursorPos X="13" Y="206"/>
         <TopLine Value="199"/>
         <UsageCount Value="12"/>
       </Unit11>
       <Unit12>
-        <Filename Value="C:\Programas\lazarus\components\sqlite\registersqlite3.pas"/>
+        <Filename Value="..\..\..\..\..\lazarus\components\sqlite\registersqlite3.pas"/>
         <UnitName Value="registersqlite3"/>
         <CursorPos X="15" Y="5"/>
         <TopLine Value="1"/>
         <UsageCount Value="11"/>
       </Unit12>
       <Unit13>
-        <Filename Value="C:\Programas\lazarus\ideintf\componenteditors.pas"/>
+        <Filename Value="..\..\..\..\..\lazarus\ideintf\componenteditors.pas"/>
         <UnitName Value="ComponentEditors"/>
         <CursorPos X="54" Y="353"/>
         <TopLine Value="330"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="1"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
-        <Filename Value="C:\Programas\FPC220\source\rtl\objpas\classes\cregist.inc"/>
+        <Filename Value="..\..\..\..\..\FPC220\source\rtl\objpas\classes\cregist.inc"/>
         <CursorPos X="17" Y="124"/>
         <TopLine Value="121"/>
         <UsageCount Value="11"/>
       </Unit14>
     </Units>
-    <JumpHistory Count="21" HistoryIndex="20">
+    <JumpHistory Count="4" HistoryIndex="3">
       <Position1>
-        <Filename Value="C:\Programas\FPC220\source\rtl\objpas\fgl.pp"/>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
         <Caret Line="1" Column="1" TopLine="1"/>
       </Position1>
       <Position2>
-        <Filename Value="C:\Programas\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
+        <Caret Line="737" Column="11" TopLine="713"/>
       </Position2>
       <Position3>
-        <Filename Value="C:\Programas\lazarus\lcl\interfaces\win32\win32wsstdctrls.pp"/>
-        <Caret Line="737" Column="11" TopLine="713"/>
+        <Filename Value="..\..\..\..\..\lazarus\ideintf\componenteditors.pas"/>
+        <Caret Line="353" Column="54" TopLine="330"/>
       </Position3>
       <Position4>
-        <Filename Value="C:\Programas\lazarus\ideintf\componenteditors.pas"/>
-        <Caret Line="353" Column="54" TopLine="330"/>
+        <Filename Value="excel5demo.lpr"/>
+        <Caret Line="49" Column="12" TopLine="30"/>
       </Position4>
-      <Position5>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="335" Column="1" TopLine="318"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="601" Column="1" TopLine="559"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position7>
-      <Position8>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="601" Column="1" TopLine="559"/>
-      </Position8>
-      <Position9>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="612" Column="1" TopLine="573"/>
-      </Position9>
-      <Position10>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="61" Column="12" TopLine="44"/>
-      </Position10>
-      <Position11>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="68" Column="17" TopLine="45"/>
-      </Position11>
-      <Position12>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="216" Column="15" TopLine="193"/>
-      </Position12>
-      <Position13>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="221" Column="15" TopLine="198"/>
-      </Position13>
-      <Position14>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="334" Column="16" TopLine="311"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="345" Column="37" TopLine="322"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="332" Column="22" TopLine="311"/>
-      </Position16>
-      <Position17>
-        <Filename Value="..\xlsbiff5.pas"/>
-        <Caret Line="351" Column="28" TopLine="298"/>
-      </Position17>
-      <Position18>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="190" Column="13" TopLine="167"/>
-      </Position18>
-      <Position19>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="189" Column="1" TopLine="167"/>
-      </Position19>
-      <Position20>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="594" Column="1" TopLine="552"/>
-      </Position20>
-      <Position21>
-        <Filename Value="..\fpspreadsheet.pas"/>
-        <Caret Line="164" Column="1" TopLine="156"/>
-      </Position21>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <PathDelim Value="\"/>
     <SearchPaths>
       <OtherUnitFiles Value="..\"/>
       <SrcPath Value="..\"/>
     </SearchPaths>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5demo.lpr b/components/fpspreadsheet/examples/excel5demo/excel5demo.lpr
index e5edc4452..74d6b48e5 100755
--- a/components/fpspreadsheet/examples/excel5demo/excel5demo.lpr
+++ b/components/fpspreadsheet/examples/excel5demo/excel5demo.lpr
@@ -10,7 +10,7 @@ program excel5demo;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, fpspreadsheet, xlsbiff5;
+  Classes, SysUtils, fpspreadsheet, xlsbiff5, laz_fpspreadsheet;
 
 var
   MyWorkbook: TsWorkbook;
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
new file mode 100644
index 000000000..15e5eb658
--- /dev/null
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="3">
+    <PathDelim Value="\"/>
+    <Name Value="laz_fpspreadsheet"/>
+    <CompilerOptions>
+      <Version Value="8"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <OtherUnitFiles Value="C:\Programas\lazarus-ccr\components\fpspreadsheet\"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\"/>
+      </SearchPaths>
+      <Other>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Files Count="8">
+      <Item1>
+        <Filename Value="fpolestorage.pas"/>
+        <UnitName Value="fpolestorage"/>
+      </Item1>
+      <Item2>
+        <Filename Value="fpsallformats.pas"/>
+        <UnitName Value="fpsallformats"/>
+      </Item2>
+      <Item3>
+        <Filename Value="fpsopendocument.pas"/>
+        <UnitName Value="fpsopendocument"/>
+      </Item3>
+      <Item4>
+        <Filename Value="fpspreadsheet.pas"/>
+        <UnitName Value="fpspreadsheet"/>
+      </Item4>
+      <Item5>
+        <Filename Value="xlsbiff2.pas"/>
+        <UnitName Value="xlsbiff2"/>
+      </Item5>
+      <Item6>
+        <Filename Value="xlsbiff5.pas"/>
+        <UnitName Value="xlsbiff5"/>
+      </Item6>
+      <Item7>
+        <Filename Value="xlsbiff8.pas"/>
+        <UnitName Value="xlsbiff8"/>
+      </Item7>
+      <Item8>
+        <Filename Value="xlsxooxml.pas"/>
+        <UnitName Value="xlsxooxml"/>
+      </Item8>
+    </Files>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="1">
+      <Item1>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item1>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>