diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp
index 04a871dced..f4a82d0df7 100644
--- a/packages/fcl-process/fpmake.pp
+++ b/packages/fcl-process/fpmake.pp
@@ -12,28 +12,27 @@ begin
     begin
 {$endif ALLPACKAGES}
 
-    P:=StartPackage('fcl-process');
+    P:=AddPackage('fcl-process');
 {$ifdef ALLPACKAGES}
-    Directory:='fcl-process';
+    P.Directory:='fcl-process';
 {$endif ALLPACKAGES}
-    Version:='2.0.0';
+    P.Version:='2.0.0';
     P.SourcePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/win',AllWindowsOSes);
     P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
-    T:=Targets.AddUnit('pipes.pp');
+    T:=P.Targets.AddUnit('pipes.pp');
       T.Dependencies.AddInclude('pipes.inc');
-    T:=Targets.AddUnit('process.pp');
+    T:=P.Targets.AddUnit('process.pp');
       T.Dependencies.AddInclude('process.inc');
 //      T.ResourceStrings:=True;
-    T:=Targets.AddUnit('simpleipc.pp');
+    T:=P.Targets.AddUnit('simpleipc.pp');
       T.Dependencies.AddInclude('simpleipc.inc');
       T.ResourceStrings:=True;
-    T:=Targets.AddUnit('dbugmsg.pp');
+    T:=P.Targets.AddUnit('dbugmsg.pp');
       T.ResourceStrings:=True;
-    T:=Targets.AddUnit('dbugintf.pp');
+    T:=P.Targets.AddUnit('dbugintf.pp');
       T.ResourceStrings:=True;
-    EndPackage;
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/hash/fpmake.pp b/packages/hash/fpmake.pp
index 93453223a6..19035fc298 100644
--- a/packages/hash/fpmake.pp
+++ b/packages/hash/fpmake.pp
@@ -5,26 +5,25 @@ program fpmake;
 uses fpmkunit;
 
 Var
+  P : TPackage;
   T : TTarget;
-
 begin
   With Installer do
     begin
 {$endif ALLPACKAGES}
 
-    StartPackage('hash');
+    P:=AddPackage('hash');
 {$ifdef ALLPACKAGES}
-    Directory:='hash';
+    P.Directory:='hash';
 {$endif ALLPACKAGES}
-    Version:='2.0.0';
-    T:=Targets.AddUnit('src/md5.pp');
-    T:=Targets.AddUnit('src/crc.pas');
-    T:=Targets.AddUnit('src/ntlm.pas');
-    T:=Targets.AddUnit('src/uuid.pas');
-    T:=Targets.AddUnit('src/unixcrypt.pas');
+    P.Version:='2.0.0';
+    T:=P.Targets.AddUnit('src/md5.pp');
+    T:=P.Targets.AddUnit('src/crc.pas');
+    T:=P.Targets.AddUnit('src/ntlm.pas');
+    T:=P.Targets.AddUnit('src/uuid.pas');
+    T:=P.Targets.AddUnit('src/unixcrypt.pas');
       T.OSes:=[Linux];
-    T:=Targets.AddExampleunit('examples/mdtest.pas');
-    EndPackage;
+    T:=P.Targets.AddExampleunit('examples/mdtest.pas');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/paszlib/fpmake.pp b/packages/paszlib/fpmake.pp
index 86a756068a..db49f52add 100644
--- a/packages/paszlib/fpmake.pp
+++ b/packages/paszlib/fpmake.pp
@@ -12,7 +12,7 @@ begin
     begin
 {$endif ALLPACKAGES}
 
-    P:=StartPackage('paszlib');
+    P:=AddPackage('paszlib');
 {$ifdef ALLPACKAGES}
     P.Directory:='paszlib';
 {$endif ALLPACKAGES}
@@ -20,7 +20,7 @@ begin
     P.Dependencies.Add('hash');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
-    T:=Targets.AddUnit('paszlib.pas');
+    T:=P.Targets.AddUnit('paszlib.pas');
       T.Dependencies.AddUnit('adler');
       T.Dependencies.AddUnit('gzio');
       T.Dependencies.AddUnit('infblock');
@@ -34,35 +34,34 @@ begin
       T.Dependencies.AddUnit('zdeflate');
       T.Dependencies.AddUnit('zinflate');
       T.Dependencies.AddUnit('zuncompr');
-    T:=Targets.AddUnit('zip.pas');
+    T:=P.Targets.AddUnit('zip.pas');
       T.Dependencies.AddUnit('paszlib');
       T.Dependencies.AddUnit('ziputils');
-    T:=Targets.AddUnit('unzip.pas');
+    T:=P.Targets.AddUnit('unzip.pas');
       T.Dependencies.AddUnit('paszlib');
       T.Dependencies.AddUnit('ziputils');
-    T:=Targets.AddUnit('zipper.pp');
+    T:=P.Targets.AddUnit('zipper.pp');
       T.Dependencies.AddUnit('paszlib');
-    T:=Targets.AddImplicitUnit('adler.pas');
+    T:=P.Targets.AddImplicitUnit('adler.pas');
       T.Dependencies.AddInclude('zconf.inc');
-    T:=Targets.AddImplicitUnit('gzio.pas');
-    T:=Targets.AddImplicitUnit('infblock.pas');
-    T:=Targets.AddImplicitUnit('infcodes.pas');
-    T:=Targets.AddImplicitUnit('inffast.pas');
-    T:=Targets.AddImplicitUnit('inftrees.pas');
-    T:=Targets.AddImplicitUnit('infutil.pas');
-    T:=Targets.AddImplicitUnit('trees.pas');
-    T:=Targets.AddImplicitUnit('zbase.pas');
-    T:=Targets.AddImplicitUnit('zcompres.pas');
-    T:=Targets.AddImplicitUnit('zdeflate.pas');
-    T:=Targets.AddImplicitUnit('zinflate.pas');
-    T:=Targets.AddImplicitUnit('zuncompr.pas');
-    T:=Targets.AddImplicitUnit('ziputils.pas');
-    T:=Targets.AddImplicitUnit('zstream.pp');
-    T:=Targets.AddExampleProgram('examples/example.pas');
-    T:=Targets.AddExampleProgram('examples/minigzip.pas');
-    T:=Targets.AddExampleProgram('examples/miniunz.pas');
-    T:=Targets.AddExampleProgram('examples/minizip.pas');
-    EndPackage;
+    T:=P.Targets.AddImplicitUnit('gzio.pas');
+    T:=P.Targets.AddImplicitUnit('infblock.pas');
+    T:=P.Targets.AddImplicitUnit('infcodes.pas');
+    T:=P.Targets.AddImplicitUnit('inffast.pas');
+    T:=P.Targets.AddImplicitUnit('inftrees.pas');
+    T:=P.Targets.AddImplicitUnit('infutil.pas');
+    T:=P.Targets.AddImplicitUnit('trees.pas');
+    T:=P.Targets.AddImplicitUnit('zbase.pas');
+    T:=P.Targets.AddImplicitUnit('zcompres.pas');
+    T:=P.Targets.AddImplicitUnit('zdeflate.pas');
+    T:=P.Targets.AddImplicitUnit('zinflate.pas');
+    T:=P.Targets.AddImplicitUnit('zuncompr.pas');
+    T:=P.Targets.AddImplicitUnit('ziputils.pas');
+    T:=P.Targets.AddImplicitUnit('zstream.pp');
+    T:=P.Targets.AddExampleProgram('examples/example.pas');
+    T:=P.Targets.AddExampleProgram('examples/minigzip.pas');
+    T:=P.Targets.AddExampleProgram('examples/miniunz.pas');
+    T:=P.Targets.AddExampleProgram('examples/minizip.pas');
 
 {$ifndef ALLPACKAGES}
     Run;