diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0bd322c8cc..65df71f6d5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-02 09:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * examples/hbextern/hbextern.prg
+    * Excluding all HB_ARCHITECTURE dirs explicitly.
+      (this resolves the recursion problem)
+    * Excluding fcomma.prg explicitly.
+    - Deleted 'example' from exclusion list.
+
+  - source/rdd/usrrdd/example
+  + tests/usrrdd
+    * Moved examples under test dir.
+
 2009-07-02 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rdd/usrrdd/rdds/Makefile
     - Removed fcomma.prg from builds since it depends on
diff --git a/harbour/examples/hbextern/hbextern.prg b/harbour/examples/hbextern/hbextern.prg
index cbd966af43..4aac09bca2 100644
--- a/harbour/examples/hbextern/hbextern.prg
+++ b/harbour/examples/hbextern/hbextern.prg
@@ -78,8 +78,9 @@ REQUEST HB_GT_CGI_DEFAULT
 #endif
 
 // List of known files which does not contain any real public function.
-STATIC s_aSkipFiles := { "profiler.prg", "msg_tpl.c" }
-STATIC s_aSkipDirs := { "tests", "example", "examples", "sample", "samples", ".svn", "%HB_ARCHITECTURE%" }
+STATIC s_aSkipFiles := { "profiler.prg", "msg_tpl.c", "fcomma.prg" }
+STATIC s_aSkipDirs := { "tests", "examples", "sample", "samples", ".svn", "bsd", "darwin", "dos", "hpux", "linux", "os2", "sunos", "wce", "win" }
+
 STATIC s_aSkipNames  := { "MAIN" }   // Init with method names you want to skip
 STATIC s_aDirsProcessed := {}
 STATIC s_aMethodAsProcedure := {}
diff --git a/harbour/source/rdd/usrrdd/example/exarr.prg b/harbour/tests/usrrdd/exarr.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exarr.prg
rename to harbour/tests/usrrdd/exarr.prg
diff --git a/harbour/source/rdd/usrrdd/example/exfcm.prg b/harbour/tests/usrrdd/exfcm.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exfcm.prg
rename to harbour/tests/usrrdd/exfcm.prg
diff --git a/harbour/source/rdd/usrrdd/example/exhsx.prg b/harbour/tests/usrrdd/exhsx.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exhsx.prg
rename to harbour/tests/usrrdd/exhsx.prg
diff --git a/harbour/source/rdd/usrrdd/example/exlog.prg b/harbour/tests/usrrdd/exlog.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exlog.prg
rename to harbour/tests/usrrdd/exlog.prg
diff --git a/harbour/source/rdd/usrrdd/example/exmemo.prg b/harbour/tests/usrrdd/exmemo.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exmemo.prg
rename to harbour/tests/usrrdd/exmemo.prg
diff --git a/harbour/source/rdd/usrrdd/example/exrlx.prg b/harbour/tests/usrrdd/exrlx.prg
similarity index 100%
rename from harbour/source/rdd/usrrdd/example/exrlx.prg
rename to harbour/tests/usrrdd/exrlx.prg