diff --git a/.gitattributes b/.gitattributes
index 4961b5804e..0832013259 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4171,6 +4171,7 @@ packages/fcl-fpcunit/src/xmlreporter.pas svneol=native#text/plain
 packages/fcl-fpcunit/src/xmltestreport.pp svneol=native#text/plain
 packages/fcl-image/Makefile svneol=native#text/plain
 packages/fcl-image/Makefile.fpc svneol=native#text/plain
+packages/fcl-image/fpmake.pp svneol=native#text/plain
 packages/fcl-image/src/bmpcomn.pp svneol=native#text/plain
 packages/fcl-image/src/clipping.pp svneol=native#text/plain
 packages/fcl-image/src/drawing.pp svneol=native#text/plain
@@ -4192,8 +4193,6 @@ packages/fcl-image/src/fpimage.pp svneol=native#text/plain
 packages/fcl-image/src/fpimgcanv.pp svneol=native#text/plain
 packages/fcl-image/src/fpimgcmn.pp svneol=native#text/plain
 packages/fcl-image/src/fpinterpolation.inc svneol=native#text/plain
-packages/fcl-image/src/fpmake.inc svneol=native#text/plain
-packages/fcl-image/src/fpmake.pp svneol=native#text/plain
 packages/fcl-image/src/fppalette.inc svneol=native#text/plain
 packages/fcl-image/src/fppen.inc svneol=native#text/plain
 packages/fcl-image/src/fppixlcanv.pp svneol=native#text/plain
diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp
new file mode 100644
index 0000000000..5de12c3de3
--- /dev/null
+++ b/packages/fcl-image/fpmake.pp
@@ -0,0 +1,226 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('fcl-image');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fcl-image';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.1';
+
+    P.Dependencies.Add('pasjpeg');
+    P.Dependencies.Add('paszlib');
+    P.Dependencies.Add('fcl-base');
+
+    P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
+
+    T:=P.Targets.AddUnit('bmpcomn.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimgcmn');
+        end;
+    T:=P.Targets.AddUnit('clipping.pp');
+    T:=P.Targets.AddUnit('ellipses.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcanvas');
+        end;
+    T:=P.Targets.AddUnit('extinterpolation.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcanvas');
+        end;
+    T:=P.Targets.AddUnit('fpcanvas.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('fphelper.inc');
+          AddInclude('fpfont.inc');
+          AddInclude('fppen.inc');
+          AddInclude('fpbrush.inc');
+          AddInclude('fpinterpolation.inc');
+          AddInclude('fpcanvas.inc');
+          AddInclude('fpcdrawh.inc');
+          AddUnit('fpimage');
+          AddUnit('clipping');
+        end;
+    T:=P.Targets.AddUnit('fpcolhash.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpditherer.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcolhash');
+        end;
+    T:=P.Targets.AddUnit('fpimage.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('fpcolors.inc');
+          AddInclude('fpimage.inc');
+          AddInclude('fphandler.inc');
+          AddInclude('fppalette.inc');
+          AddInclude('fpcolcnv.inc');
+        end;
+    T:=P.Targets.AddUnit('fpimgcanv.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fppixlcanv');
+          AddUnit('fpimage');
+          AddUnit('clipping');
+        end;
+    T:=P.Targets.AddUnit('fpimgcmn.pp');
+    T:=P.Targets.AddUnit('fppixlcanv.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcanvas');
+          AddUnit('pixtools');
+          AddUnit('ellipses');
+          AddUnit('clipping');
+        end;
+    T:=P.Targets.AddUnit('fpquantizer.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcolhash');
+        end;
+    T:=P.Targets.AddUnit('fpreadbmp.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('bmpcomn');
+        end;
+    T:=P.Targets.AddUnit('fpreadjpeg.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpreadpcx.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('pcxcomn');
+        end;
+    T:=P.Targets.AddUnit('fpreadpng.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpimgcmn');
+          AddUnit('pngcomn');
+        end;
+    T:=P.Targets.AddUnit('fpreadpnm.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpreadtga.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('targacmn');
+        end;
+    T:=P.Targets.AddUnit('fpreadxpm.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpwritebmp.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('bmpcomn');
+        end;
+    T:=P.Targets.AddUnit('fpwritejpeg.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpreadjpeg');
+        end;
+    T:=P.Targets.AddUnit('fpwritepcx.pas');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('pcxcomn');
+        end;
+    T:=P.Targets.AddUnit('fpwritepng.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpimgcmn');
+          AddUnit('pngcomn');
+        end;
+    T:=P.Targets.AddUnit('fpwritepnm.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('fpwritetga.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('targacmn');
+        end;
+    T:=P.Targets.AddUnit('fpwritexpm.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('freetypeh.pp');
+    T:=P.Targets.AddUnit('freetype.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('freetypeh');
+          AddUnit('fpimgcmn');
+        end;
+    T:=P.Targets.AddUnit('ftfont.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpcanvas');
+          AddUnit('fpimgcmn');
+          AddUnit('freetype');
+          AddUnit('freetypeh');
+          AddUnit('fpimage');
+        end;
+    T:=P.Targets.AddUnit('pcxcomn.pas');
+    T:=P.Targets.AddUnit('pixtools.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpcanvas');
+          AddUnit('fpimage');
+          AddUnit('clipping');
+          AddUnit('ellipses');
+        end;
+    T:=P.Targets.AddUnit('pngcomn.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpimgcmn');
+        end;
+    T:=P.Targets.AddUnit('pscanvas.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('fpimage');
+          AddUnit('fpcanvas');
+        end;
+    T:=P.Targets.AddUnit('targacmn.pp');
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}
diff --git a/packages/fcl-image/src/fpmake.inc b/packages/fcl-image/src/fpmake.inc
deleted file mode 100644
index 0732d209ee..0000000000
--- a/packages/fcl-image/src/fpmake.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-{ Make image directory and all subdirectories }
-{ FULLFCL will be defined if included from main FCL directory }
-
-Targets.ResetDefaults;
-Targets.DefaultDir:='image';
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('fpimgcmn');
-T:=Targets.AddUnit('fpimage');
-T:=Targets.AddUnit('pngcomn');
-T:=Targets.AddUnit('fpreadpng');
-T:=Targets.AddUnit('fpwritepng');
-T:=Targets.AddUnit('fpreadxpm');
-T:=Targets.AddUnit('fpwritexpm');
-T:=Targets.AddUnit('clipping');
-T:=Targets.AddUnit('fpcanvas');
-T:=Targets.AddUnit('pixtools');
-T:=Targets.AddUnit('fppixlcanv');
-T:=Targets.AddUnit('fpimgcanv');
-T:=Targets.AddUnit('pscanvas');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('fpwritebmp');
-T:=Targets.AddUnit('fpreadbmp');
-T:=Targets.AddUnit('bmpcomn');
-T:=Targets.AddUnit('fpreadpnm');
-T:=Targets.AddUnit('fpwritepnm');
-T:=Targets.AddUnit('fpreadjpeg');
-T:=Targets.AddUnit('fpwritejpeg');
-T:=Targets.AddUnit('targacmn');
-T:=Targets.AddUnit('fpreadtga');
-T:=Targets.AddUnit('fpwritetga');
-T:=Targets.AddUnit('ellipses');
-T:=Targets.AddUnit('freetypeh');
-T.OS:=[win32,linux,freebsd];
-T:=Targets.AddUnit('freetype');
-T.OS:=[win32,linux,freebsd];
-T:=Targets.AddUnit('ftfont');
-T.OS:=[win32,linux,freebsd];
-Targets.AddExampleProgram('imgconv');
diff --git a/packages/fcl-image/src/fpmake.pp b/packages/fcl-image/src/fpmake.pp
deleted file mode 100644
index 071c4869a6..0000000000
--- a/packages/fcl-image/src/fpmake.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-{$mode objfpc}
-{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-   
-begin
-  ChangeDir('..');
-  With Installer do 
-    begin
-    {$i ../fclmake.inc}
-    {$i fpmake.inc}
-    EndPackage;
-    Run;
-    end;
-end.
-