diff --git a/packages/aspell/fpmake.pp b/packages/aspell/fpmake.pp
index 82235dffa7..25acb77283 100644
--- a/packages/aspell/fpmake.pp
+++ b/packages/aspell/fpmake.pp
@@ -28,6 +28,9 @@ begin
 
     P.Sources.AddSrc('LICENSE');
     P.Sources.AddSrc('LICENSE.ADDON');
+
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('example.pas');
     
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/bzip2/fpmake.pp b/packages/bzip2/fpmake.pp
index d0756307f5..bbef64ba3a 100644
--- a/packages/bzip2/fpmake.pp
+++ b/packages/bzip2/fpmake.pp
@@ -26,6 +26,10 @@ begin
           AddInclude('bzip2i386.inc',[i386],AllOSes);
         end;
 
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('pasbzip.pas');
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
diff --git a/packages/cdrom/fpmake.pp b/packages/cdrom/fpmake.pp
index 9ec0a58ff6..188eed4ff4 100644
--- a/packages/cdrom/fpmake.pp
+++ b/packages/cdrom/fpmake.pp
@@ -56,8 +56,14 @@ begin
         end;
     T:=P.Targets.AddUnit('wnaspi32.pp',[Win32,Win64]);
 
+
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('getdiscid.pp');
+    T:=P.Targets.AddExampleProgram('showcds.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
diff --git a/packages/chm/fpmake.pp b/packages/chm/fpmake.pp
index 3a8637d5c4..18a170a138 100644
--- a/packages/chm/fpmake.pp
+++ b/packages/chm/fpmake.pp
@@ -70,6 +70,10 @@ begin
           AddUnit('paslznonslide');
         end;
 
+//    P.ProgramPath.Add('src');
+    T:=P.Targets.AddProgram('chmls.lpr');
+    T:=P.Targets.AddProgram('chmcmd.lpr');
+
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/dbus/fpmake.pp b/packages/dbus/fpmake.pp
index e2f700af0b..a62a7e858a 100644
--- a/packages/dbus/fpmake.pp
+++ b/packages/dbus/fpmake.pp
@@ -40,6 +40,8 @@ begin
           AddInclude('dbus-threads.inc');
         end;
 
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('busexample.pp');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp
index 73efde2da7..c0c303fb94 100644
--- a/packages/fcl-base/fpmake.pp
+++ b/packages/fcl-base/fpmake.pp
@@ -95,13 +95,94 @@ begin
 
     // Windows units
     T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
-    T:=P.Targets.AddUnit('fileinfo',AllWindowsOSes);
+    T:=P.Targets.AddUnit('fileinfo.pp',AllWindowsOSes);
 
     // Additional sources
     P.Sources.AddSrcFiles('src/win/fclel.*');
 
+    // Examples
+    P.ExamplePath.Add('examples');
+      T:=P.Targets.AddExampleProgram('asiotest.pp');
+      T:=P.Targets.AddExampleProgram('b64dec.pp');
+      T:=P.Targets.AddExampleProgram('b64enc.pp');
+      T:=P.Targets.AddExampleProgram('b64.pp');
+      T:=P.Targets.AddExampleProgram('b64test2.pp');
+      T:=P.Targets.AddExampleProgram('b64test.pp');
+      T:=P.Targets.AddExampleProgram('base64decodingtestcase.pas');
+      T:=P.Targets.AddExampleProgram('cachetest.pp');
+      T:=P.Targets.AddExampleProgram('cfgtest.pp');
+      T:=P.Targets.AddExampleProgram('daemon.pp');
+      T:=P.Targets.AddExampleProgram('daemon.txt');
+      T:=P.Targets.AddExampleProgram('dbugsrv.pp');
+      T:=P.Targets.AddExampleProgram('debugtest.pp');
+      T:=P.Targets.AddExampleProgram('doecho.pp');
+      T:=P.Targets.AddExampleProgram('dparser.pp');
+      T:=P.Targets.AddExampleProgram('dsockcli.pp');
+      T:=P.Targets.AddExampleProgram('dsocksvr.pp');
+      T:=P.Targets.AddExampleProgram('fpdoc.dtd');
+      T:=P.Targets.AddExampleProgram('fstream.pp');
+      T:=P.Targets.AddExampleProgram('htdump.pp');
+      T:=P.Targets.AddExampleProgram('ipcclient.pp');
+      T:=P.Targets.AddExampleProgram('ipcserver.pp');
+      T:=P.Targets.AddExampleProgram('isockcli.pp');
+      T:=P.Targets.AddExampleProgram('isocksvr.pp');
+      T:=P.Targets.AddExampleProgram('istream.pp');
+      T:=P.Targets.AddExampleProgram('list.pp');
+      T:=P.Targets.AddExampleProgram('mstream.pp');
+      T:=P.Targets.AddExampleProgram('poolmm1.pp');
+      T:=P.Targets.AddExampleProgram('poolmm2.pp');
+      T:=P.Targets.AddExampleProgram('restest.pp');
+      T:=P.Targets.AddExampleProgram('showver.pp');
+      T:=P.Targets.AddExampleProgram('sockcli.pp');
+      T:=P.Targets.AddExampleProgram('socksvr.pp');
+      T:=P.Targets.AddExampleProgram('sstream.pp');
+      T:=P.Targets.AddExampleProgram('stringl.pp');
+      T:=P.Targets.AddExampleProgram('tarmakerconsgzip.pas');
+      T:=P.Targets.AddExampleProgram('tarmakercons.pas');
+      T:=P.Targets.AddExampleProgram('testapp.pp');
+      T:=P.Targets.AddExampleProgram('testbf.pp');
+      T:=P.Targets.AddExampleProgram('testbs.pp');
+      T:=P.Targets.AddExampleProgram('testcgi.pp');
+      T:=P.Targets.AddExampleProgram('testcont.pp');
+      T:=P.Targets.AddExampleProgram('testez.pp');
+      T:=P.Targets.AddExampleProgram('testhres.pp');
+      T:=P.Targets.AddExampleProgram('testnres.pp');
+      T:=P.Targets.AddExampleProgram('testol.pp');
+      T:=P.Targets.AddExampleProgram('testproc.pp');
+      T:=P.Targets.AddExampleProgram('testreg.pp');
+      T:=P.Targets.AddExampleProgram('testrhre.pp');
+      T:=P.Targets.AddExampleProgram('testrnre.pp');
+      T:=P.Targets.AddExampleProgram('testrsre.pp');
+      T:=P.Targets.AddExampleProgram('testrtf.pp');
+      T:=P.Targets.AddExampleProgram('testser.pp');
+      T:=P.Targets.AddExampleProgram('testsres.pp');
+      T:=P.Targets.AddExampleProgram('testtimer.pp');
+      T:=P.Targets.AddExampleProgram('testunzip.pp');
+      T:=P.Targets.AddExampleProgram('testur.pp');
+      T:=P.Targets.AddExampleProgram('testweb.pp');
+      T:=P.Targets.AddExampleProgram('testz2.pp');
+      T:=P.Targets.AddExampleProgram('testzip.pp');
+      T:=P.Targets.AddExampleProgram('testz.pp');
+      T:=P.Targets.AddExampleProgram('threads.pp');
+      T:=P.Targets.AddExampleProgram('tidea.pp');
+      T:=P.Targets.AddExampleProgram('tstelcmd.pp');
+      T:=P.Targets.AddExampleProgram('tstelgtk.pp');
+      T:=P.Targets.AddExampleProgram('txmlreg.pp');
+      T:=P.Targets.AddExampleProgram('xmldump.pp');
+
+      // example data files.
+      // README
+      // kword.xml
+      // overview.rtf
+      // showver.rc
+      // showver.res
+      // simple.xml
+      // parser.dat
+      // testcgi.html
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp
index dbcbd89b59..0e5d6f9a81 100644
--- a/packages/fcl-db/fpmake.pp
+++ b/packages/fcl-db/fpmake.pp
@@ -18,6 +18,32 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/base');
+    P.SourcePath.Add('src/paradox');
+    P.SourcePath.Add('src/sqldb');
+    P.SourcePath.Add('src/sqldb/postgres');
+    P.SourcePath.Add('src/sqldb/sqlite');
+    P.SourcePath.Add('src/sqldb/interbase');
+    P.SourcePath.Add('src/sqldb/mysql');
+    P.SourcePath.Add('src/sqldb/odbc');
+    P.SourcePath.Add('src/sqldb/examples');
+    P.SourcePath.Add('src/sqldb/oracle');
+    P.SourcePath.Add('src/sdf');
+    P.SourcePath.Add('src/datadict');
+    P.SourcePath.Add('src/memds');
+    P.SourcePath.Add('src/codegen');
+    P.SourcePath.Add('src/export');
+    P.SourcePath.Add('src/sqlite');
+    P.SourcePath.Add('src/dbase');
+    P.IncludePath.Add('src/base');
+    P.IncludePath.Add('src/sqldb');
+    P.IncludePath.Add('src/sqldb/postgres');
+    P.IncludePath.Add('src/sqldb/mysql');
+    P.IncludePath.Add('src/sdf');
+    P.IncludePath.Add('src/memds');  
+    P.IncludePath.Add('src/sqlite');
+    P.IncludePath.Add('src/dbase');
+
 
     T:=P.Targets.AddUnit('bufdataset.pas');
       with T.Dependencies do
@@ -550,9 +576,27 @@ begin
           AddUnit('db');
         end;
 
+    P.ExamplePath.Add('tests');
+    T:=P.Targets.AddExampleProgram('dbftoolsunit.pas');
+    T:=P.Targets.AddExampleProgram('dbtestframework.pas');
+    T:=P.Targets.AddExampleProgram('memdstoolsunit.pas');
+    T:=P.Targets.AddExampleProgram('sdfdstoolsunit.pas');
+    T:=P.Targets.AddExampleProgram('sqldbtoolsunit.pas');
+    T:=P.Targets.AddExampleProgram('testbasics.pas');
+    T:=P.Targets.AddExampleProgram('testdatasources.pas');
+    T:=P.Targets.AddExampleProgram('testdbbasics.pas');
+    T:=P.Targets.AddExampleProgram('testdddiff.pp');
+    T:=P.Targets.AddExampleProgram('testfieldtypes.pas');
+    T:=P.Targets.AddExampleProgram('testsqlscript.pas');
+    T:=P.Targets.AddExampleProgram('toolsunit.pas');
+    // database.ini.txt
+    // README.txt
 
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
+
+
diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp
index 7c2e4c80a8..8cc21f89be 100644
--- a/packages/fcl-image/fpmake.pp
+++ b/packages/fcl-image/fpmake.pp
@@ -219,8 +219,13 @@ begin
         end;
     T:=P.Targets.AddUnit('targacmn.pp');
 
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('drawing.pp');
+    T:=P.Targets.AddExampleProgram('imgconv.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+