diff --git a/.gitattributes b/.gitattributes
index 61b33ef4b1..b93575fc45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4320,7 +4320,6 @@ packages/fcl-xml/tests/xmlts.pp svneol=native#text/plain
 packages/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/Makefile svneol=native#text/plain
 packages/fpmkunit/Makefile.fpc svneol=native#text/plain
-packages/fpmkunit/fpmake.inc svneol=native#text/plain
 packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
 packages/hash/Makefile svneol=native#text/plain
diff --git a/packages/fpmkunit/fpmake.inc b/packages/fpmkunit/fpmake.inc
deleted file mode 100644
index 8ea67e7f5a..0000000000
--- a/packages/fpmkunit/fpmake.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-    StartPackage('fpmkunit');
-    Version:='2.0.0';
-    Description:='Free Pascal Make Tool';
-    T:=Targets.AddUnit('fpmkunit');
-      T.Directory:='src';
-    EndPackage;
diff --git a/packages/fpmkunit/fpmake.pp b/packages/fpmkunit/fpmake.pp
index fd3a279bb5..44abf3d31d 100644
--- a/packages/fpmkunit/fpmake.pp
+++ b/packages/fpmkunit/fpmake.pp
@@ -1,15 +1,30 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
 uses fpmkunit;
 
-var
+Var
   T : TTarget;
+
 begin
-  with Installer do
+  With Installer do
     begin
-      {$i fpmake.inc}
-      Run;
+{$endif ALLPACKAGES}
+
+    StartPackage('fpmkunit');
+{$ifdef ALLPACKAGES}
+    Directory:='fpmkunit';
+{$endif ALLPACKAGES}
+    AddDependency('paszlib');
+    AddDependency('fcl-process');
+    Version:='2.2.0';
+    Description:='Free Pascal Make Tool';
+    T:=Targets.AddUnit('src/fpmkunit.pp');
+    EndPackage;
+
+{$ifndef ALLPACKAGES}
+    Run;
     end;
 end.
-
+{$endif ALLPACKAGES}