diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12a77ca8c2..dbc1ad39ba 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-20 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    * Changed to install libs by default to lib/<plat>/<comp> on *nixes too.
+      (if HB_INSTALL_PREFIX isn't a system location)
+
+  * config/dyn.mk
+    ! Typo in prev.
+
 2009-09-20 14:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.sh
     ! Fix to strip command. Now using 'find' again and using -maxdepth 1
diff --git a/harbour/config/dyn.mk b/harbour/config/dyn.mk
index 2822d66cfd..051490a135 100644
--- a/harbour/config/dyn.mk
+++ b/harbour/config/dyn.mk
@@ -56,7 +56,7 @@ ifneq ($(DY_RULE),)
 DYN_NAME := $(DYN_PREF)$(DYNNAME)$(DYN_EXT)
 DYN_FILE := $(DYN_DIR)/$(DYN_NAME)
 DYN_NAME2 := $(DYN_PREF)$(DYNNAME2)$(DYN_EXT)
-DYN_FILE2 := $(DYN_DIR)/$(DYNNAME2)
+DYN_FILE2 := $(DYN_DIR)/$(DYN_NAME2)
 
 ifneq ($(IMP_DIR),)
    IMP_NAME := $(LIB_PREF)$(DYNNAME)$(LIB_EXT)
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 8e7b47722a..ac5998ec0e 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1234,22 +1234,25 @@ ifneq ($(HB_INSTALL_PREFIX),)
    else ifeq ($(HB_PLATFORM_UNIX),)
       LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
    else
+      LIBPOSTFIX :=
+      # Use 'lib64' instead of 'lib' for 64-bit targets where lib64 dir exists
+      ifneq ($(wildcard $(HB_INSTALL_PREFIX)$(DIRSEP)lib64),)
+         ifneq ($(filter $(HB_CPU),x86_64),)
+            LIBPOSTFIX := 64
+         endif
+      endif
       # Not perfect, please enhance it.
       ifneq ($(findstring |/usr,|$(HB_INSTALL_PREFIX)),)
          ifeq ($(findstring |/usr/home,|$(HB_INSTALL_PREFIX)),)
-            LIBPOSTFIX := $(DIRSEP)harbour
+            LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
             INCPOSTFIX := $(DIRSEP)harbour
          endif
       else
          ifneq ($(findstring |/opt,|$(HB_INSTALL_PREFIX)),)
-            LIBPOSTFIX := $(DIRSEP)harbour
+            LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
             INCPOSTFIX := $(DIRSEP)harbour
-         endif
-      endif
-      # Use 'lib64' instead of 'lib' for 64-bit targets where lib64 dir exists
-      ifneq ($(wildcard $(HB_INSTALL_PREFIX)$(DIRSEP)lib64),)
-         ifneq ($(filter $(HB_CPU),x86_64),)
-            LIBPOSTFIX := 64$(LIBPOSTFIX)
+         else
+            LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
          endif
       endif
    endif