diff --git a/.gitattributes b/.gitattributes
index a92170be72..76081617b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2873,6 +2873,7 @@ packages/gmp/examples/printf_example.pas svneol=native#text/plain
 packages/gmp/examples/printf_example2.pas svneol=native#text/plain
 packages/gmp/examples/scanf_example.pas svneol=native#text/plain
 packages/gmp/examples/scanf_example2.pas svneol=native#text/plain
+packages/gmp/fpmake.pp svneol=native#text/plain
 packages/gmp/readme svneol=native#text/plain
 packages/gmp/src/gmp.pas svneol=native#text/plain
 packages/gnome1/Makefile svneol=native#text/plain
diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp
index 0b88d61ad1..1404cf5612 100644
--- a/packages/fcl-net/fpmake.pp
+++ b/packages/fcl-net/fpmake.pp
@@ -20,6 +20,7 @@ begin
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');
     P.Dependencies.Add('fcl-passrc');
+    P.Dependencies.Add('fcl-async');
 
     P.Author := 'Sebastian Guenther and Free Pascal development team';
     P.License := 'LGPL with modification, ';
diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp
index 36191adf64..7a42fe8bea 100644
--- a/packages/fcl-xml/fpmake.pp
+++ b/packages/fcl-xml/fpmake.pp
@@ -19,10 +19,9 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.Options.Add('-S2h');
-    D:=P.Dependencies.Add('paszlib');
-      D.Version:='2.2.2-0';
     D:=P.Dependencies.Add('fcl-base');
       D.Version:='2.2.2-0';
+    D:=P.Dependencies.Add('iconvenc',[linux,darwin,iphonesim,freebsd,haiku,beos]);
 
     P.Author := 'Sebastian Guenther, Sergei Gorelkin and FPC development team';
     P.License := 'LGPL with modification, ';
diff --git a/packages/fpmake_add.inc b/packages/fpmake_add.inc
index 06df3ec353..037bb5e832 100644
--- a/packages/fpmake_add.inc
+++ b/packages/fpmake_add.inc
@@ -32,6 +32,7 @@
   add_gdbint;
   add_gdbm;
   add_ggi;
+  add_gmp;
   add_gnome1;
   add_graph;
   add_gtk1;
diff --git a/packages/fpmake_proc.inc b/packages/fpmake_proc.inc
index 9c507c9059..5121e9c79e 100644
--- a/packages/fpmake_proc.inc
+++ b/packages/fpmake_proc.inc
@@ -202,6 +202,12 @@ begin
 {$include ggi/fpmake.pp}
 end;
 
+procedure add_gmp;
+begin
+  with Installer do
+{$include gmp/fpmake.pp}
+end;
+
 procedure add_gnome1;
 begin
   with Installer do
diff --git a/packages/gmp/fpmake.pp b/packages/gmp/fpmake.pp
new file mode 100644
index 0000000000..aa7aa62f0f
--- /dev/null
+++ b/packages/gmp/fpmake.pp
@@ -0,0 +1,35 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('gmp');
+{$ifdef ALLPACKAGES}
+    P.Directory:='gmp';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.2-0';
+
+    P.Author := 'FreePascal development team';
+    P.License := 'LGPL with modification, ';
+    P.HomepageURL := 'www.freepascal.org';
+    P.Email := '';
+    P.Description := 'GMP';
+    P.NeedLibC:= false;
+
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('gmp.pas');
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}
diff --git a/packages/opencl/fpmake.pp b/packages/opencl/fpmake.pp
index 917e937d12..d5cb8f96bc 100644
--- a/packages/opencl/fpmake.pp
+++ b/packages/opencl/fpmake.pp
@@ -26,6 +26,8 @@ begin
     P.OSes:=[linux,win64,win32,darwin];
     P.CPUs:=[i386,x86_64];
 
+    P.Dependencies.Add('opengl');
+
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
diff --git a/packages/opengl/fpmake.pp b/packages/opengl/fpmake.pp
index 7089626730..d378040ba8 100644
--- a/packages/opengl/fpmake.pp
+++ b/packages/opengl/fpmake.pp
@@ -24,10 +24,12 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
+    T:=P.Targets.AddImplicitUnit('freeglut.pp',AllOSes-[morphos]);
     T:=P.Targets.AddUnit('glext.pp');
     T:=P.Targets.AddUnit('gl.pp');
     T:=P.Targets.AddUnit('glu.pp');
     T:=P.Targets.AddUnit('glut.pp');
+    T.Dependencies.Add('freeglut',AllOSes-[morphos]);
     T:=P.Targets.AddUnit('glx.pp',AllUnixOSes);
 
     P.ExamplePath.Add('examples');
diff --git a/packages/pasjpeg/fpmake.pp b/packages/pasjpeg/fpmake.pp
index 09321719ca..3f2afd2646 100644
--- a/packages/pasjpeg/fpmake.pp
+++ b/packages/pasjpeg/fpmake.pp
@@ -21,6 +21,23 @@ begin
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 
+    T:=P.Targets.AddUnit('jctrans.pp');
+    with T.Dependencies do
+      begin
+      AddUnit('jmorecfg');
+      AddUnit('jinclude');
+      AddUnit('jdeferr');
+      AddUnit('jerror');
+      AddUnit('jutils');
+      AddUnit('jpeglib');
+      AddUnit('jcapimin');
+      AddUnit('jcparam');
+      AddUnit('jcomapi');
+      AddUnit('jcmaster');
+      AddUnit('jchuff');
+      AddUnit('jcphuff');
+      AddUnit('jcmarker');
+      end;
     T:=P.Targets.AddUnit('buildpasjpeg.pp');
       T.Install:=False;
       with T.Dependencies do