diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4bbb60c283..8544ac4c1f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,29 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-14 01:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/rddsql/sddmy/tests/hbmk.hbm
+  - contrib/rddsql/sddmy/tests/sddmy.hbc
+  + contrib/rddsql/sddmy/sddmy.hbc
+  - contrib/rddsql/tests/rddsql.hbc
+  + contrib/rddsql/sddodbc/tests/hbmk.hbm
+  - contrib/rddsql/sddodbc/tests/sddodbc.hbc
+  + contrib/rddsql/sddodbc/sddodbc.hbc
+  + contrib/rddsql/tests/hbmk.hbm
+  + contrib/rddsql/rddsql.hbc
+    * Rearranged according to new .hbc/.hbm layout.
+      Layout:
+         in 'tests' where final app are residing, I've
+         added an automatically processed hbmk2 option
+         file: hbmk.hbm.
+         This file refers to the .hbc file belonging to
+         the SDD: sdd*.hbc, residing in the parent dir.
+         This file in turn refers to the .hbc file belonging to
+         the main RDDSQL: rddsql.hbc, resising in the parent dir.
+         so this is the reference chain when issuing
+         hbmk2 <test.prg> in one of the test dirs:
+            hbmk.hbm -> sdd*.hbc -> rddsql.hbc
+
 2009-06-14 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbblat/hbblat.hbc
   * contrib/hbhpdf/hbhpdf.hbc
diff --git a/harbour/contrib/rddsql/tests/rddsql.hbc b/harbour/contrib/rddsql/rddsql.hbc
similarity index 100%
rename from harbour/contrib/rddsql/tests/rddsql.hbc
rename to harbour/contrib/rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddmy/sddmy.hbc b/harbour/contrib/rddsql/sddmy/sddmy.hbc
new file mode 100644
index 0000000000..7703c96325
--- /dev/null
+++ b/harbour/contrib/rddsql/sddmy/sddmy.hbc
@@ -0,0 +1,8 @@
+#
+# $Id$
+#
+
+libs=sddmy
+libs=libmysql
+
+hbcs=../rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddmy/tests/hbmk.hbm b/harbour/contrib/rddsql/sddmy/tests/hbmk.hbm
new file mode 100644
index 0000000000..1249697d59
--- /dev/null
+++ b/harbour/contrib/rddsql/sddmy/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../sddmy.hbc
diff --git a/harbour/contrib/rddsql/sddmy/tests/sddmy.hbc b/harbour/contrib/rddsql/sddmy/tests/sddmy.hbc
deleted file mode 100644
index 9ead76e864..0000000000
--- a/harbour/contrib/rddsql/sddmy/tests/sddmy.hbc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-libs=rddsql sddmy libmysql
diff --git a/harbour/contrib/rddsql/sddodbc/sddodbc.hbc b/harbour/contrib/rddsql/sddodbc/sddodbc.hbc
new file mode 100644
index 0000000000..7e0b37a612
--- /dev/null
+++ b/harbour/contrib/rddsql/sddodbc/sddodbc.hbc
@@ -0,0 +1,8 @@
+#
+# $Id$
+#
+
+libs=sddodbc
+{win}libs=odbc32
+
+hbcs=../rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddodbc/tests/hbmk.hbm b/harbour/contrib/rddsql/sddodbc/tests/hbmk.hbm
new file mode 100644
index 0000000000..982e1cc592
--- /dev/null
+++ b/harbour/contrib/rddsql/sddodbc/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../sddodbc.hbc
diff --git a/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc b/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc
deleted file mode 100644
index 5bb28427c7..0000000000
--- a/harbour/contrib/rddsql/sddodbc/tests/sddodbc.hbc
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-
-libs=rddsql sddodbc
-{win}libs=odbc32
diff --git a/harbour/contrib/rddsql/tests/arrayrdd.prg b/harbour/contrib/rddsql/tests/arrayrdd.prg
index 180541bbe3..cde377478c 100644
--- a/harbour/contrib/rddsql/tests/arrayrdd.prg
+++ b/harbour/contrib/rddsql/tests/arrayrdd.prg
@@ -23,4 +23,4 @@ PROC main()
 RETURN
 
 
-PROC RDDSYS();  RETURN
\ No newline at end of file
+PROC RDDSYS();  RETURN
diff --git a/harbour/contrib/rddsql/tests/hbmk.hbm b/harbour/contrib/rddsql/tests/hbmk.hbm
new file mode 100644
index 0000000000..4549f0ac62
--- /dev/null
+++ b/harbour/contrib/rddsql/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../rddsql.hbc