diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ca24605bda..1f00a8259f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-03-31 18:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/win/global.mk
+  * Makefile
+    ! fixed to find unicows libs when HB_BUILD_NAME is set
+
 2012-03-31 18:42 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + will now add lib/3rd dir to the link commands, so
diff --git a/harbour/Makefile b/harbour/Makefile
index 1b91f9eea8..b1cf4c14cc 100644
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -8,8 +8,8 @@ include $(ROOT)config/global.mk
 
 DIRS :=
 
-ifneq ($(wildcard lib/3rd/$(PLAT_COMP)),)
-   DIRS += lib/3rd/$(PLAT_COMP)
+ifneq ($(wildcard lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)),)
+   DIRS += lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)
 endif
 
 ifeq ($(HB_BUILD_PARTS),compiler)
diff --git a/harbour/config/win/global.mk b/harbour/config/win/global.mk
index 2f46916627..baa5a3a2b8 100644
--- a/harbour/config/win/global.mk
+++ b/harbour/config/win/global.mk
@@ -18,8 +18,8 @@ HB_GT_LIBS += gtwvt gtgui gtwin
 # gdi32: gtwvt
 
 # unicows lib must come after user libs and before Windows system libs
-ifneq ($(wildcard $(TOP)$(ROOT)lib/3rd/$(PLAT_COMP)),)
-   SYSLIBPATHS += $(TOP)$(ROOT)lib/3rd/$(PLAT_COMP)
+ifneq ($(wildcard $(TOP)$(ROOT)lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)),)
+   SYSLIBPATHS += $(TOP)$(ROOT)lib/3rd/$(HB_PLATFORM)/$(HB_COMPILER)
    SYSLIBS += unicows
 endif