diff --git a/.gitattributes b/.gitattributes
index 13a6843d5d..d0a5a8e819 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13208,6 +13208,7 @@ utils/dxegen/Makefile svneol=native#text/plain
 utils/dxegen/Makefile.fpc svneol=native#text/plain
 utils/dxegen/coff.pp svneol=native#text/plain
 utils/dxegen/dxegen.pp svneol=native#text/plain
+utils/dxegen/fpmake.pp svneol=native#text/plain
 utils/fpcm/Makefile svneol=native#text/plain
 utils/fpcm/Makefile.fpc svneol=native#text/plain
 utils/fpcm/fpcmake.inc svneol=native#text/plain
@@ -13232,12 +13233,14 @@ utils/fpcmkcfg/fpcmkcfg.pp svneol=native#text/plain
 utils/fpcmkcfg/fpinc.cfg svneol=native#text/plain
 utils/fpcmkcfg/fpinc.ini svneol=native#text/plain
 utils/fpcmkcfg/fpini.inc svneol=native#text/plain
+utils/fpcmkcfg/fpmake.pp svneol=native#text/plain
 utils/fpcmkcfg/fppkg.cfg svneol=native#text/plain
 utils/fpcmkcfg/fppkg.inc svneol=native#text/plain
 utils/fpcres/Makefile svneol=native#text/plain
 utils/fpcres/Makefile.fpc svneol=native#text/plain
 utils/fpcres/closablefilestream.pas svneol=native#text/plain
 utils/fpcres/fpcres.pas svneol=native#text/plain
+utils/fpcres/fpmake.pp svneol=native#text/plain
 utils/fpcres/msghandler.pas svneol=native#text/plain
 utils/fpcres/paramparser.pas svneol=native#text/plain
 utils/fpcres/sourcehandler.pas svneol=native#text/plain
@@ -13303,6 +13306,7 @@ utils/fpdoc/fpdoc.lpi svneol=native#text/plain
 utils/fpdoc/fpdoc.pp svneol=native#text/plain
 utils/fpdoc/fpdocproj.pas svneol=native#text/plain
 utils/fpdoc/fpdocxmlopts.pas svneol=native#text/plain
+utils/fpdoc/fpmake.pp svneol=native#text/plain
 utils/fpdoc/intl/Makefile svneol=native#text/plain
 utils/fpdoc/intl/dglobals.de.po svneol=native#text/plain
 utils/fpdoc/intl/dglobals.sk.po svneol=native#text/plain
@@ -13327,10 +13331,14 @@ utils/fpgmake/fpmake.cft svneol=native#text/plain
 utils/fpgmake/fpmake.inc svneol=native#text/plain
 utils/fpgmake/fpmakecreatefile.pas svneol=native#text/plain
 utils/fpgmake/fpmakeparsejson.pas svneol=native#text/plain
+utils/fpmake.pp svneol=native#text/plain
+utils/fpmake_add.inc svneol=native#text/plain
+utils/fpmake_proc.inc svneol=native#text/plain
 utils/fpmc/Makefile svneol=native#text/plain
 utils/fpmc/Makefile.fpc svneol=native#text/plain
 utils/fpmc/README.txt svneol=native#text/plain
 utils/fpmc/dumpfile.pp svneol=native#text/plain
+utils/fpmc/fpmake.pp svneol=native#text/plain
 utils/fpmc/fpmc.pp svneol=native#text/plain
 utils/fpmc/fpmcgtk.pp svneol=native#text/plain
 utils/fpmc/frmabout.pp svneol=native#text/plain
@@ -13393,6 +13401,7 @@ utils/fprcp/demo.h -text
 utils/fprcp/demo.pp svneol=native#text/plain
 utils/fprcp/demo.rc -text
 utils/fprcp/expr.pp svneol=native#text/plain
+utils/fprcp/fpmake.pp svneol=native#text/plain
 utils/fprcp/fprcp.pp svneol=native#text/plain
 utils/fprcp/pasprep.pp svneol=native#text/plain
 utils/fprcp/use_demo.bat -text
@@ -13415,6 +13424,7 @@ utils/h2pas/yylex.cod -text
 utils/h2pas/yyparse.cod -text
 utils/importtl/Makefile svneol=native#text/plain
 utils/importtl/Makefile.fpc svneol=native#text/plain
+utils/importtl/fpmake.pp svneol=native#text/plain
 utils/importtl/importtl.lpi svneol=native#text/plain
 utils/importtl/importtl.pas svneol=native#text/plain
 utils/instantfpc/Makefile svneol=native#text/plain
@@ -13425,6 +13435,7 @@ utils/instantfpc/examples/exitcode.pas svneol=native#text/plain
 utils/instantfpc/examples/getworkingdirectory.pas svneol=native#text/plain
 utils/instantfpc/examples/helloworld.pas svneol=native#text/plain
 utils/instantfpc/examples/writeparameters.pas svneol=native#text/plain
+utils/instantfpc/fpmake.pp svneol=native#text/plain
 utils/instantfpc/instantfpc.lpi svneol=native#text/plain
 utils/instantfpc/instantfpc.pas svneol=native#text/plain
 utils/instantfpc/instantfptools.pas svneol=native#text/plain
@@ -13445,6 +13456,7 @@ utils/ptopu.pp svneol=native#text/plain
 utils/rmcvsdir.pp svneol=native#text/plain
 utils/rmwait/Makefile svneol=native#text/plain
 utils/rmwait/Makefile.fpc svneol=native#text/plain
+utils/rmwait/fpmake.pp svneol=native#text/plain
 utils/rmwait/rmwait.pas svneol=native#text/plain
 utils/rstconv.pp svneol=native#text/plain
 utils/sim_pasc/Answers svneol=native#text/plain
diff --git a/utils/dxegen/fpmake.pp b/utils/dxegen/fpmake.pp
new file mode 100644
index 0000000000..2808823a89
--- /dev/null
+++ b/utils/dxegen/fpmake.pp
@@ -0,0 +1,50 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_dxegen;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('dxegen');
+
+    P.Author := 'Charles Sandmann and others';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := 'sandmann@clio.rice.edu';
+    P.Description := 'DXEGEN converts COFF object files to .DXE files that can be loaded and '+
+                     'relocated runtime.';
+    P.NeedLibC:= false;
+
+    P.OSes:=[go32v2];
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fprcp';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    T:=P.Targets.AddProgram('dxegen.pas');
+    T.Dependencies.AddUnit('coff');
+
+    P.Targets.AddUnit('coff.pp').install:=false;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_dxegen;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/fpcmkcfg/fpmake.pp b/utils/fpcmkcfg/fpmake.pp
new file mode 100644
index 0000000000..1df359650a
--- /dev/null
+++ b/utils/fpcmkcfg/fpmake.pp
@@ -0,0 +1,59 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fpcmkcfg;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fpcmkcfg');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'An utility to creaty the Free Pascal configuration files.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpcmkcfg';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-process');
+
+    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpc.cft fpccfg.inc DefaultConfig','fpccfg.inc','fpc.cft');
+    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpinc.cfg fpcfg.inc fpcfg','fpcfg.inc','fpinc.cfg');
+    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpinc.ini fpini.inc fpini','fpini.inc','fpinc.ini');
+    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fppkg.cfg fppkg.inc fppkg','fppkg.inc','fppkg.cfg');
+    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s default.cft default.inc fppkg_default','default.inc','default.cft');
+
+    T:=P.Targets.AddProgram('fpcmkcfg.pp');
+    T.ResourceStrings:=true;
+    T.Dependencies.AddInclude('fpccfg.inc');
+    T.Dependencies.AddInclude('fpcfg.inc');
+    T.Dependencies.AddInclude('fpini.inc');
+    T.Dependencies.AddInclude('fppkg.inc');
+    T.Dependencies.AddInclude('default.inc');
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fpcmkcfg;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/fpcres/fpmake.pp b/utils/fpcres/fpmake.pp
new file mode 100644
index 0000000000..5674e2e092
--- /dev/null
+++ b/utils/fpcres/fpmake.pp
@@ -0,0 +1,59 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fpcres;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fpcres');
+
+    P.Author := 'Giulio Bernardi';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Free Pascal Resource Converter.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpcres';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.OSes:=[win32,win64,wince,haiku,linux,freebsd,openbsd,netbsd,darwin,iphonesim,solaris,os2,emx];
+
+    P.Dependencies.Add('fcl-res');
+
+    T:=P.Targets.AddProgram('fpcres.pas');
+    T.Dependencies.AddUnit('closablefilestream');
+    T.Dependencies.AddUnit('msghandler');
+    T.Dependencies.AddUnit('paramparser');
+    T.Dependencies.AddUnit('sourcehandler');
+    T.Dependencies.AddUnit('target');
+
+    P.Targets.AddUnit('closablefilestream.pas').install:=false;
+    P.Targets.AddUnit('msghandler.pas').install:=false;
+    P.Targets.AddUnit('paramparser.pas').install:=false;
+    P.Targets.AddUnit('sourcehandler.pas').install:=false;
+    P.Targets.AddUnit('target.pas').install:=false;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fpcres;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/fpdoc/fpmake.pp b/utils/fpdoc/fpmake.pp
new file mode 100644
index 0000000000..5b8f15649a
--- /dev/null
+++ b/utils/fpdoc/fpmake.pp
@@ -0,0 +1,98 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fpdoc;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fpdoc');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Free Pascal documentation generation utility.';
+    P.NeedLibC:= false;
+
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fcl-xml');
+    P.Dependencies.Add('fcl-passrc');
+    P.Dependencies.Add('chm');
+    P.Dependencies.Add('univint',[darwin,iphonesim]);
+
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpdoc';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.Options.Add('-S2h');
+
+    T:=P.Targets.AddProgram('fpdoc.pp');
+    T.Dependencies.AddUnit('dglobals');
+    T.Dependencies.AddUnit('dw_ipflin');
+    T.Dependencies.AddUnit('dwriter');
+    T.Dependencies.AddUnit('dw_xml');
+    T.Dependencies.AddUnit('dglobals');
+    T.Dependencies.AddUnit('sh_pas');
+    T.Dependencies.AddUnit('dw_html');
+    T.Dependencies.AddUnit('dw_latex');
+    T.Dependencies.AddUnit('dwlinear');
+    T.Dependencies.AddUnit('dw_txt');
+    T.Dependencies.AddUnit('dw_linrtf');
+
+    T:=P.Targets.AddProgram('makeskel.pp');
+    T.ResourceStrings:=true;
+    T.Dependencies.AddUnit('dglobals');
+
+    T:=P.Targets.AddProgram('unitdiff.pp');
+    T.ResourceStrings:=true;
+    T:=P.Targets.AddProgram('fpclasschart.pp');
+    T.ResourceStrings:=true;
+
+    T := P.Targets.AddUnit('dglobals.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    T := P.Targets.AddUnit('dwriter.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    T := P.Targets.AddUnit('fpdocxmlopts.pas');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    P.Targets.AddUnit('dw_xml.pp').install:=false;
+    P.Targets.AddUnit('sh_pas.pp').install:=false;
+    P.Targets.AddUnit('dw_html.pp').install:=false;
+    P.Targets.AddUnit('dw_latex.pp').install:=false;
+    P.Targets.AddUnit('dw_txt.pp').install:=false;
+    P.Targets.AddUnit('dw_man.pp').install:=false;
+    P.Targets.AddUnit('dwlinear.pp').install:=false;
+    P.Targets.AddUnit('dw_linrtf.pp').install:=false;
+    P.Targets.AddUnit('dw_dxml.pp').install:=false;
+    P.Targets.AddUnit('fpdocproj.pas').install:=false;
+    P.Targets.AddUnit('mkfpdoc.pp').install:=false;
+    P.Targets.AddUnit('dw_ipflin.pas').install:=false;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fpdoc;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/fpmake.pp b/utils/fpmake.pp
new file mode 100644
index 0000000000..1ab71c0283
--- /dev/null
+++ b/utils/fpmake.pp
@@ -0,0 +1,69 @@
+{$mode objfpc}{$H+}
+{$define allpackages}
+program fpmake;
+
+uses fpmkunit, sysutils;
+
+procedure add_utils;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('utils');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Various Free Pascal utilities.';
+    P.NeedLibC:= false;
+
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('paszlib');
+    P.Dependencies.Add('hash');
+    P.Dependencies.Add('univint',[darwin,iphonesim]);
+
+    P.Version:='2.7.1';
+
+    T:=P.Targets.AddProgram('ptop.pp');
+    T.Dependencies.AddUnit('ptopu');
+    T.ResourceStrings:=true;
+
+    P.Targets.AddProgram('ppdep.pp');
+    P.Targets.AddProgram('ptop.pp');
+    P.Targets.AddProgram('rstconv.pp').ResourceStrings:=true;
+    P.Targets.AddProgram('data2inc.pp');
+    P.Targets.AddProgram('delp.pp');
+    P.Targets.AddProgram('bin2obj.pp');
+    P.Targets.AddProgram('postw32.pp');
+    P.Targets.AddProgram('rmcvsdir.pp');
+    P.Targets.AddProgram('grab_vcsa.pp');
+
+    P.Targets.AddUnit('ptopu.pp').install:=false;
+    end;
+end;
+
+(*
+
+The include files are generated with the following commands:
+
+rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s;\nbegin\n  with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo "  add_$cleanedname;" >> fpmake_add.inc; done
+
+*)
+
+{$include fpmake_proc.inc}
+
+begin
+{$include fpmake_add.inc}
+  add_utils;
+
+  Installer.Run;
+end.
+
+
+
+
diff --git a/utils/fpmake_add.inc b/utils/fpmake_add.inc
new file mode 100644
index 0000000000..cb36c2bcc4
--- /dev/null
+++ b/utils/fpmake_add.inc
@@ -0,0 +1,13 @@
+  add_dxegen;
+  add_fpcm;
+  add_fpcmkcfg;
+  add_fpcres;
+  add_fpdoc;
+  add_fpmc;
+  add_fppkg_util;
+  add_fprcp;
+  add_h2pas;
+  add_importtl;
+  add_instantfpc;
+  add_rmwait;
+  add_tply;
diff --git a/utils/fpmake_proc.inc b/utils/fpmake_proc.inc
new file mode 100644
index 0000000000..60f4062154
--- /dev/null
+++ b/utils/fpmake_proc.inc
@@ -0,0 +1,26 @@
+{$include dxegen/fpmake.pp}
+
+{$include fpcm/fpmake.pp}
+
+{$include fpcmkcfg/fpmake.pp}
+
+{$include fpcres/fpmake.pp}
+
+{$include fpdoc/fpmake.pp}
+
+{$include fpmc/fpmake.pp}
+
+{$include fppkg/fpmake.pp}
+
+{$include fprcp/fpmake.pp}
+
+{$include h2pas/fpmake.pp}
+
+{$include importtl/fpmake.pp}
+
+{$include instantfpc/fpmake.pp}
+
+{$include rmwait/fpmake.pp}
+
+{$include tply/fpmake.pp}
+
diff --git a/utils/fpmc/fpmake.pp b/utils/fpmc/fpmake.pp
new file mode 100644
index 0000000000..0efe994a34
--- /dev/null
+++ b/utils/fpmc/fpmake.pp
@@ -0,0 +1,80 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit, sysutils;
+{$endif ALLPACKAGES}
+
+procedure add_fpmc;
+
+Var
+  P : TPackage;
+  T : TTarget;
+  gtkOSes: TOSes;
+  gtkdll: string;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fpmc');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Free Pascal Message Compiler.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fpmc';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.OSes := [win32, win64, os2, emx];
+
+    gtkOSes:=[linux];
+    // Only compile fpmcgtk on win32 when the gtk-library is found in the path
+    gtkdll:=FileSearch('libgtk-0.dll',GetEnvironmentVariable('PATH'),[sfoImplicitCurrentDir, sfoStripQuotes]);
+    if gtkdll<>'' then
+      include(gtkOSes,win32);
+
+    P.Dependencies.Add('fcl-base');
+    P.Dependencies.Add('fpgtk',gtkOSes);
+
+    T:=P.Targets.AddProgram('fpmc.pp');
+    T.Dependencies.AddUnit('msgcomp');
+
+    T:=P.Targets.AddProgram('fpmcgtk.pp',gtkOSes);
+    T.Dependencies.AddUnit('msgcomp');
+    T.Dependencies.AddUnit('frmmain');
+    T.Dependencies.AddUnit('frmabout');
+    T.Dependencies.AddUnit('frmoptions');
+
+    T:=P.Targets.AddUnit('frmmain.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('frmabout.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('frmoptions.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+
+    T:=P.Targets.AddUnit('msgcomp.pp');
+    T.install:=false;
+    T.ResourceStrings:=true;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fpmc;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/fprcp/fpmake.pp b/utils/fprcp/fpmake.pp
new file mode 100644
index 0000000000..2f1ce29e54
--- /dev/null
+++ b/utils/fprcp/fpmake.pp
@@ -0,0 +1,53 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fprcp;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('fprcp');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'fprcp.exe extracts from C header and Pascal files included into resource '+
+                     'scripts numerical constants and replaces these constants to its values '+
+                     'in resource script.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='fprcp';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    T:=P.Targets.AddProgram('fprcp.pp');
+    T.Dependencies.AddUnit('comments');
+    T.Dependencies.AddUnit('expr');
+    T.Dependencies.AddUnit('pasprep');
+
+    P.Targets.AddUnit('comments.pp').install:=false;
+    P.Targets.AddUnit('expr.pp').install:=false;
+    P.Targets.AddUnit('pasprep.pp').install:=false;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fprcp;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/importtl/fpmake.pp b/utils/importtl/fpmake.pp
new file mode 100644
index 0000000000..cbdb97cb91
--- /dev/null
+++ b/utils/importtl/fpmake.pp
@@ -0,0 +1,46 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_importtl;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('importtl');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Reads type information from "file" and converts it into a freepascal binding.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='importtl';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.OSes:=[win32,win64];
+
+    T:=P.Targets.AddProgram('importtl.pas');
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_rmwait;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/instantfpc/fpmake.pp b/utils/instantfpc/fpmake.pp
new file mode 100644
index 0000000000..07b9c7d2c2
--- /dev/null
+++ b/utils/instantfpc/fpmake.pp
@@ -0,0 +1,52 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_instantfpc;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('instantfpc');
+
+    P.Author := '<various>';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'A tool to execute pascal programs as unix scripts.';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='instantfpc';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.Dependencies.Add('fcl-process');
+    P.Options.Add('-S2h');
+
+    P.OSes := [win32,win64,wince,haiku,linux,freebsd,openbsd,netbsd,darwin,iphonesim,solaris];
+
+    T:=P.Targets.AddProgram('instantfpc.pas');
+    T.Dependencies.AddUnit('instantfptools');
+
+    P.Targets.AddUnit('instantfptools.pas').Install:=False;
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_instantfpc;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/rmwait/fpmake.pp b/utils/rmwait/fpmake.pp
new file mode 100644
index 0000000000..74254b8cfe
--- /dev/null
+++ b/utils/rmwait/fpmake.pp
@@ -0,0 +1,46 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_rmwait;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('rmwait');
+
+    P.Author := 'Tomas Hajny';
+    P.License := 'LGPL with modification';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'Tool to remove (delete) file(s) with optional retries';
+    P.NeedLibC:= false;
+
+{$ifdef ALLPACKAGES}
+    P.Directory:='rmwait';
+{$endif ALLPACKAGES}
+    P.Version:='2.7.1';
+
+    P.OSes:=[win32,win64,wince,os2,emx,go32v2];
+
+    T:=P.Targets.AddProgram('rmwait.pas');
+    end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_rmwait;
+  Installer.Run;
+end.
+{$endif ALLPACKAGES}
+
+
+
+
diff --git a/utils/tply/fpmake.pp b/utils/tply/fpmake.pp
index f9714b7b40..4b6b82dc59 100644
--- a/utils/tply/fpmake.pp
+++ b/utils/tply/fpmake.pp
@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 {$endif ALLPACKAGES}
 
-procedure add_lexyacc;
+procedure add_tply;
 
 Var
   P : TPackage;
@@ -15,7 +15,7 @@ Var
 begin
   With Installer do
     begin
-    P:=AddPackage('lexyacc');
+    P:=AddPackage('tply');
 
     P.Author := '<various>';
     P.License := 'LGPL with modification';
@@ -25,7 +25,7 @@ begin
     P.NeedLibC:= false;
 
 {$ifdef ALLPACKAGES}
-    P.Directory:='lexyacc';
+    P.Directory:='tply';
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 
@@ -76,8 +76,7 @@ begin
     P.Sources.AddSrc('fpcmake.ini');
     P.Sources.AddSrc('fpcmake.inc');
 
-    writeln({$I %FPCTARGETOS%});
-    if (OSToString(defaults.OS)=lowercase({$I %FPCTARGETOS%})) and
+     if (OSToString(defaults.OS)=lowercase({$I %FPCTARGETOS%})) and
        (CPUToString(defaults.CPU)=lowercase({$I %FPCTARGETCPU%})) then
       begin
       // Do not install these files when performing a cross-installation
@@ -93,7 +92,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_lexyacc;
+  add_tply;
   Installer.Run;
 end.
 {$endif ALLPACKAGES}