diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 34208e63de..6ba1ffc23f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-22 18:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/vxworks/gcc.mk
+  * config/vxworks/diab.mk
+  * config/darwin/gcc.mk
+  * config/darwin/icc.mk
+  * config/darwin/clang.mk
+  * config/linux/gcc.mk
+    * Cleaned to use new central variables for harbour dynlib links.
+    ; TODO: Do the same with rest of *nix targets when adding soname
+            and '2.1' style symlinks, when current system proves okay
+            with darwin and linux/gcc targets.
+
 2011-02-22 18:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/fscopy.c
     * Restored open mode. Still waiting for proper fix.
@@ -107,7 +119,7 @@
       'install' was not tested.
     ; TODO: Clean variable usage, there is some redundancy, plus
             some places where current solution is not generic, f.e.
-            using HB_VER_*, HB_DYNLIB_BASE vs. HB_DYNLIB_NAME, etc.
+            using HB_VER_*, HB_DYNLIB_BASE vs. HB_DYNLIB_NAME, etc. [DONE]
 
   * harbour/src/rtl/fscopy.c
     * Reverted 2011-02-22 12:27 UTC+0200 Mindaugas Kavaliauskas
diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk
index 61989efde2..97184be7c6 100644
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -61,6 +61,6 @@ DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) -install_name "$(DYN_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT)
+DY_RULE = $(DY) $(DFLAGS) -install_name "$(DYN_NAME_NVR)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)$(DYN_EXT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index 993f8b37c6..5302dbe9e2 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -65,6 +65,6 @@ DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) -install_name "$(DYN_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT)
+DY_RULE = $(DY) $(DFLAGS) -install_name "$(DYN_NAME_NVR)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk
index 0f83894363..3ac2b6730a 100644
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -56,9 +56,9 @@ endef
 define create_dynlib
    $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
    $(foreach file,$^,$(dynlib_object))
-   $(DY) $(DFLAGS) -install_name "$(DYN_PREF)$(DYNNAME)$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -filelist __dyn__.tmp $(DLIBS) $(DYSTRIP)
+   $(DY) $(DFLAGS) -install_name "$(DYN_NAME_NVR)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -filelist __dyn__.tmp $(DLIBS) $(DYSTRIP)
    $(LN) $(@F) $(DYN_FILE_NVR)
-   $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME).$(HB_VER_MAJOR).$(HB_VER_MINOR)$(DYN_EXT)
+   $(LN) $(@F) $(DYN_FILE_CPT)
 endef
 
 DY_RULE = $(create_dynlib)
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index 95c9e98f61..c91c53c2b4 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -55,6 +55,6 @@ DFLAGS += -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_PREF)$(DYNNAME)$(DYN_EXT)$(HB_DYNLIB_PEXC) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME)$(DYN_EXT)$(HB_DYNLIB_PEXC)
+DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/vxworks/diab.mk b/harbour/config/vxworks/diab.mk
index 1e3d55895a..f2848931ac 100644
--- a/harbour/config/vxworks/diab.mk
+++ b/harbour/config/vxworks/diab.mk
@@ -97,7 +97,7 @@ endef
 define create_dynlib
    $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
    $(foreach file,$^,$(dynlib_object))
-   $(DY) $(DFLAGS) -soname="$(DYN_PREF)$(DYNNAME)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP)
+   $(DY) $(DFLAGS) -soname="$(DYN_NAME_CPT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP)
 endef
 
 DY_RULE = $(create_dynlib)
diff --git a/harbour/config/vxworks/gcc.mk b/harbour/config/vxworks/gcc.mk
index e222f3c430..7b6f35ce1f 100644
--- a/harbour/config/vxworks/gcc.mk
+++ b/harbour/config/vxworks/gcc.mk
@@ -78,7 +78,7 @@ endef
 define create_dynlib
    $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
    $(foreach file,$^,$(dynlib_object))
-   $(DY) $(DFLAGS) -Wl,-soname,"$(DYN_PREF)$(DYNNAME)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP)
+   $(DY) $(DFLAGS) -Wl,-soname,"$(DYN_NAME_CPT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP)
 endef
 
 DY_RULE = $(create_dynlib)