diff --git a/packages/fpvectorial/fpmake.pp b/packages/fpvectorial/fpmake.pp
index 363ad2d16b..04df8203bc 100644
--- a/packages/fpvectorial/fpmake.pp
+++ b/packages/fpvectorial/fpmake.pp
@@ -30,7 +30,6 @@ begin
 
     P.SourcePath.Add('src');
 
-    T:=P.Targets.AddImplicitUnit('jwazmouse.pas');
     T:=P.Targets.AddImplicitUnit('avisocncgcodereader'); 
     T:=P.Targets.AddImplicitUnit('avisocncgcodewriter');
     T:=P.Targets.AddImplicitUnit('svgvectorialwriter');
diff --git a/packages/graph/fpmake.pp b/packages/graph/fpmake.pp
index 1dd5357558..0c1b0ec713 100644
--- a/packages/graph/fpmake.pp
+++ b/packages/graph/fpmake.pp
@@ -24,12 +24,18 @@ begin
     P.Description := 'A portable, yet usable substitute for the Turbo Pascal Graph unit.';
     P.NeedLibC:= false;  // true for headers that indirectly link to libc? OS specific?
 
-    P.CPUs:=[i386,powerpc];
+    P.CPUs:=[i386,x86_64,powerpc];
     P.OSes:=[win32,linux,freebsd,darwin];
 
     P.Dependencies.Add('sdl',[i386,powerpc],[win32,linux,freebsd,darwin]);
+    P.Dependencies.Add('ptc',[win32,win64,linux]);
+    // Dependencies for ptc, due to fpcmake bug:
+    P.Dependencies.Add('fcl-base',[win32,win64,linux]);
+    P.Dependencies.Add('x11',[win32,win64,linux]);
+    P.Dependencies.Add('hermes',[win32,win64,linux]);
 
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/ptcgraph');
     P.SourcePath.Add('src/macosx',[darwin]);
     P.SourcePath.Add('src/amiga',[amiga]);
     P.SourcePath.Add('src/go32v2',[go32v2]);
@@ -91,6 +97,12 @@ begin
         begin
           AddUnit('graph');
         end;
+    T:=P.Targets.AddUnit('ptcgraph.pp',[win32,win64,linux]);
+    T:=P.Targets.AddUnit('ptccrt.pp',[win32,win64,linux]);
+      with T.Dependencies do
+        begin
+          AddUnit('ptcgraph');
+        end;
 
 
 {$ifndef ALLPACKAGES}
diff --git a/packages/objcrtl/fpmake.pp b/packages/objcrtl/fpmake.pp
index 89a3728f56..9754220d75 100644
--- a/packages/objcrtl/fpmake.pp
+++ b/packages/objcrtl/fpmake.pp
@@ -15,6 +15,7 @@ begin
     P.Directory:='objcrtl';
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
+    P.OSes:=[darwin,iphonesim];
     P.Author := 'Library: Apple, header: Dmitry "skalogryz" Boyarintsev';
     P.License := 'Library: Apple, header: LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';