diff --git a/packages/gdbm/fpmake.pp b/packages/gdbm/fpmake.pp
index a9362e20c1..6242628444 100644
--- a/packages/gdbm/fpmake.pp
+++ b/packages/gdbm/fpmake.pp
@@ -29,8 +29,8 @@ begin
     T:=P.Targets.AddUnit('gdbm.pp');
 
     P.ExamplePath.Add('examples');
-    P.Targets.AddExampleProgram('tests/testgdbm.pp');
-    P.Targets.AddExampleProgram('tests/testgdbm2.pp');
+    P.Targets.AddExampleProgram('testgdbm.pp');
+    P.Targets.AddExampleProgram('testgdbm2.pp');
 
 
 {$ifndef ALLPACKAGES}
diff --git a/packages/gmp/fpmake.pp b/packages/gmp/fpmake.pp
index 144bb91b2d..4914cc3f74 100644
--- a/packages/gmp/fpmake.pp
+++ b/packages/gmp/fpmake.pp
@@ -28,6 +28,9 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('gmp.pas');
+
+    P.Sources.AddExampleFiles('examples/*',false,'.');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
diff --git a/packages/gtk2/fpmake.pp b/packages/gtk2/fpmake.pp
index 98825312a6..9a4162f349 100644
--- a/packages/gtk2/fpmake.pp
+++ b/packages/gtk2/fpmake.pp
@@ -1263,6 +1263,17 @@ begin
            AddInclude('htmldocument.inc');
            AddInclude('htmlview.inc');
          end;}
+    P.Sources.AddExampleFiles('examples/*',false,'.');
+    P.Sources.AddExampleFiles('examples/filechooser/*',false,'filechooser');
+    P.Sources.AddExampleFiles('examples/gettingstarted/*',false,'gettingstarted');
+    P.Sources.AddExampleFiles('examples/gtk_demo/*',false,'gtk_demo');
+    P.Sources.AddExampleFiles('examples/gtkglext/*',false,'gtkglext');
+    P.Sources.AddExampleFiles('examples/helloworld/*',false,'helloworld');
+    P.Sources.AddExampleFiles('examples/helloworld2/*',false,'helloworld2');
+    P.Sources.AddExampleFiles('examples/plugins/*',false,'plugins');
+    P.Sources.AddExampleFiles('examples/scribble_simple/*',false,'scribble_simple');
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
diff --git a/packages/ibase/fpmake.pp b/packages/ibase/fpmake.pp
index 67b85135d9..24c841f4d9 100644
--- a/packages/ibase/fpmake.pp
+++ b/packages/ibase/fpmake.pp
@@ -40,9 +40,10 @@ begin
           AddInclude('ibase60.inc');
         end;
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testib40.pp');
     P.Targets.AddExampleProgram('testib60.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/libcurl/fpmake.pp b/packages/libcurl/fpmake.pp
index d78527ab7b..9000cac29e 100644
--- a/packages/libcurl/fpmake.pp
+++ b/packages/libcurl/fpmake.pp
@@ -30,9 +30,11 @@ begin
 
     T:=P.Targets.AddUnit('libcurl.pp');
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testcurl.pp');
     P.Targets.AddExampleProgram('teststream.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
+
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/libgd/fpmake.pp b/packages/libgd/fpmake.pp
index 7d9ddf0fec..dfaa16f42d 100644
--- a/packages/libgd/fpmake.pp
+++ b/packages/libgd/fpmake.pp
@@ -21,9 +21,10 @@ begin
 
     T:=P.Targets.AddUnit('gd.pas');
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('gdtestcgi.pp');
     P.Targets.AddExampleProgram('gdtest.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/libxml/fpmake.pp b/packages/libxml/fpmake.pp
index 6f889a27f0..9a2ea11482 100644
--- a/packages/libxml/fpmake.pp
+++ b/packages/libxml/fpmake.pp
@@ -85,10 +85,7 @@ begin
     P.Targets.AddExampleProgram('tree2.pas');
     P.Targets.AddExampleProgram('exutils.pas');
     P.Targets.AddExampleProgram('reader2.pas');
-    // 'Makefile
-    // 'Makefile.fpc
-    // 'test1.xml
-    // 'test2.xml
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/mysql/fpmake.pp b/packages/mysql/fpmake.pp
index 4727ca883b..c6ab711bdb 100644
--- a/packages/mysql/fpmake.pp
+++ b/packages/mysql/fpmake.pp
@@ -122,7 +122,7 @@ begin
         end;
     T.ResourceStrings := True;
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testdb3.pp');
     P.Targets.AddExampleProgram('testdb4.pp');
     P.Targets.AddExampleProgram('mysqls.pp');
diff --git a/packages/odbc/fpmake.pp b/packages/odbc/fpmake.pp
index 5cfc1c1871..b279bddef9 100644
--- a/packages/odbc/fpmake.pp
+++ b/packages/odbc/fpmake.pp
@@ -31,9 +31,9 @@ begin
           AddInclude('odbcsql.inc');
         end;
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testodbc.pp');
-    // 'testodbc.mdb
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/postgres/fpmake.pp b/packages/postgres/fpmake.pp
index ff02e8bd36..f69730a1c1 100644
--- a/packages/postgres/fpmake.pp
+++ b/packages/postgres/fpmake.pp
@@ -51,10 +51,11 @@ begin
 
     P.Sources.AddSrc('README.txt');
 
-    P.ExamplePath.Add('tests/');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testpg2.pp');
     P.Targets.AddExampleProgram('testpg1.pp');
-  
+    P.Sources.AddExampleFiles('examples/*',false,'.');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
diff --git a/packages/regexpr/fpmake.pp b/packages/regexpr/fpmake.pp
index 0823c84448..b9d70f77aa 100644
--- a/packages/regexpr/fpmake.pp
+++ b/packages/regexpr/fpmake.pp
@@ -28,8 +28,9 @@ begin
 
     T.ResourceStrings := True;
 
-    P.ExamplePath.Add('tests');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testreg1.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/svgalib/fpmake.pp b/packages/svgalib/fpmake.pp
index dda30f9b27..f0d02fa82d 100644
--- a/packages/svgalib/fpmake.pp
+++ b/packages/svgalib/fpmake.pp
@@ -24,9 +24,10 @@ begin
 
     P.Sources.AddSrc('README.txt');
  
-    P.ExamplePath.Add('tests/');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testvga.pp');
     P.Targets.AddExampleProgram('vgatest.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/syslog/fpmake.pp b/packages/syslog/fpmake.pp
index 9e7e7c5df7..da69a671b3 100644
--- a/packages/syslog/fpmake.pp
+++ b/packages/syslog/fpmake.pp
@@ -21,8 +21,9 @@ begin
 
     T:=P.Targets.AddUnit('systemlog.pp');
 
-    P.ExamplePath.Add('tests/');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testlog.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
 
 {$ifndef ALLPACKAGES}
     Run;
diff --git a/packages/uuid/fpmake.pp b/packages/uuid/fpmake.pp
index e141bd8ac2..4a76ee10f0 100644
--- a/packages/uuid/fpmake.pp
+++ b/packages/uuid/fpmake.pp
@@ -25,9 +25,11 @@ begin
 
     P.Sources.AddSrc('README.txt');
 
-    P.ExamplePath.Add('tests/');
+    P.ExamplePath.Add('examples');
     P.Targets.AddExampleProgram('testlibuid.pp');
     P.Targets.AddExampleProgram('testuid.pp');
+    P.Sources.AddExampleFiles('examples/*',false,'.');
+
 
 {$ifndef ALLPACKAGES}
     Run;