diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 72bfcea76e..5ce380c445 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-31 13:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/hbmk2.prg
+    ! small fix in FN_FromArray() which caused that relative paths were
+      converted to the root directory, i.e. -workdir=. was not working
+      correctly
+
 2011-01-31 09:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Enabled to use link scripts with msvc compilers, to avoid
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 7d3efa5c56..af90c72623 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -8550,7 +8550,10 @@ STATIC FUNCTION FN_FromArray( aPath, nFrom, nTo, cFileName, cDirPrefix )
 
    cDir := ""
    FOR tmp := nFrom TO nTo
-      cDir += aPath[ tmp ] + hb_ps()
+      cDir += aPath[ tmp ]
+      IF nFrom < nTo
+         cDir += hb_ps()
+      ENDIF
    NEXT
 
    RETURN hb_FNameMerge( DirDelPathSep( DirAddPathSep( cDirPrefix ) + cDir ), cFileName )