diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4bcb276d39..3337381a12 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-07 14:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbpost.hbm
+    ! Fixed to place contrib dynamic libs in lib dir on *nix systems.
+
 2010-08-07 11:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
     + Generalized the way dynamic lib dependencies are found
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index 98e16d2f03..f8369072fa 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -49,10 +49,12 @@
 {hbdyn}-o${hb_outputname}${hb_dynsuffix}
 
 {hblib}-o../lib/${hb_plat}/${hb_comp}${hb_build}/
-{hbexe|hbdyn}-o../bin/${hb_plat}/${hb_comp}${hb_build}/
+{(hbexe|hbdyn)&unix}-o../lib/${hb_plat}/${hb_comp}${hb_build}/
+{(hbexe|hbdyn)&!unix}-o../bin/${hb_plat}/${hb_comp}${hb_build}/
 
 {hblib}-workdir=../lib/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
-{hbexe|hbdyn}-workdir=../bin/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
+{(hbexe|hbdyn)&unix}-workdir=../lib/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
+{(hbexe|hbdyn)&!unix}-workdir=../bin/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
 
 {_HB_BUILD_INSTALL&_HB_INSTALL_LIB&hblib}-instpath=${_HB_INSTALL_LIB}/
 {_HB_BUILD_INSTALL&_HB_INSTALL_BIN&hbexe}-instpath=${_HB_INSTALL_BIN}/