diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 698ac86c2a..8850cee4f4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,28 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-11 13:45 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbdroid/hbdroid.hbp
+    * minor cleanup
+
+  * contrib/rddbm/rddbm.hbp
+    ! missed to add .hbx as source
+
+  * contrib/rddsql/tests/arrayrdd.prg
+    + fixed to work when run as script.
+      (Could not achieve the same with SDD tests.)
+
+  * utils/hbmk2/hbmk2.prg
+    + added very experimental support for using macros
+      in source filenames. The search for options and
+      special extensions will be done before macro
+      expansion, ie. if it doesn't match any options or
+      special extensions, it will be considered a
+      source a file and then expanded. Useful f.e. for
+      '${hb_name}.hbx', but plain '${ENVVAR}' will also
+      be considered a source filename. Can be abused, too,
+      but not recommended.
+
 2012-11-11 12:59 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/rddbm/rddbm.hbp
   * extras/gtwvw/gtwvw.hbp
diff --git a/harbour/contrib/hbdroid/hbdroid.hbp b/harbour/contrib/hbdroid/hbdroid.hbp
index a38b061aa3..58b0c82a28 100644
--- a/harbour/contrib/hbdroid/hbdroid.hbp
+++ b/harbour/contrib/hbdroid/hbdroid.hbp
@@ -5,7 +5,7 @@
 -hblib
 -inc
 
--o${hb_targetname}
+-o${hb_name}
 
 -w3 -es2
 
diff --git a/harbour/contrib/rddbm/rddbm.hbp b/harbour/contrib/rddbm/rddbm.hbp
index b15df9b94f..03513d58a2 100644
--- a/harbour/contrib/rddbm/rddbm.hbp
+++ b/harbour/contrib/rddbm/rddbm.hbp
@@ -9,6 +9,8 @@
 
 -w3 -es2
 
+rddbm.hbx
+
 bmdbfx.c
 bmdbfcdx.prg
 bmdbfnsx.prg
diff --git a/harbour/contrib/rddsql/tests/arrayrdd.prg b/harbour/contrib/rddsql/tests/arrayrdd.prg
index 3124673eb0..dc2305db13 100644
--- a/harbour/contrib/rddsql/tests/arrayrdd.prg
+++ b/harbour/contrib/rddsql/tests/arrayrdd.prg
@@ -8,6 +8,13 @@ REQUEST SQLMIX
 
 PROCEDURE Main()
 
+   CLS
+
+#if defined( __HBSCRIPT__HBSHELL )
+   rddRegister( "SQLBASE" )
+   rddRegister( "SQLMIX" )
+#endif
+
    rddSetDefault( "SQLMIX" )
    dbCreate( "persons", { { "NAME", "C", 20, 0 }, { "FAMILYNAME", "C", 20, 0 }, { "BIRTH", "D", 8, 0 }, { "AMOUNT", "N", 9, 2 } }, , .T., "persons" )
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index c5c7b1132d..1308c17811 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3346,7 +3346,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
       OTHERWISE
 
-         cParam := PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] )
+         cParam := PathMakeAbsolute( PathSepToSelf( MacroProc( hbmk, cParam, aParam[ _PAR_cFileName ] ) ), aParam[ _PAR_cFileName ] )
          IF Empty( hb_FNameExt( cParam ) )
             cParam := hb_FNameExtSet( cParam, ".prg" )
          ELSEIF hb_FNameExt( cParamL ) == ".hbx"