diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 690afa1fc0..0e69573168 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,85 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-09 16:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmysql/hbmysql.hbc
+  * contrib/hbct/hbct.hbc
+  * contrib/hbgt/hbgt.hbc
+  * contrib/hbmxml/hbmxml.hbc
+  * contrib/make.hbs
+  * contrib/hbmzip/hbmzip.hbc
+  * contrib/hbunix/hbunix.hbc
+  * contrib/sddpg/sddpg.hbc
+  * contrib/hbziparc/hbziparc.hbc
+  * contrib/hbxbp/hbxbp.hbc
+  * contrib/hblzf/hblzf.hbc
+  * contrib/hbblink/hbblink.hbc
+  * contrib/hbxdiff/hbxdiff.hbc
+  * contrib/hbcurl/hbcurl.hbc
+  * contrib/hbnetio/hbnetio.hbc
+  * contrib/rddsql/rddsql.hbc
+  * contrib/hbhttpd/hbhttpd.hbc
+  * contrib/gtwvg/gtwvg.hbc
+  * contrib/hbpgsql/hbpgsql.hbc
+  * contrib/sddsqlt3/sddsqlt3.hbc
+  * contrib/hbformat/hbformat.hbc
+  * contrib/hbwin/hbwin.hbc
+  * contrib/hbsms/hbsms.hbc
+  * contrib/gtalleg/gtalleg.hbc
+  * contrib/sddmy/sddmy.hbc
+  * contrib/hbodbc/hbodbc.hbc
+  * contrib/xhb/xhb.hbc
+  * contrib/sddfb/sddfb.hbc
+  * contrib/hbtpathy/hbtpathy.hbc
+  * contrib/rddbm/rddbm.hbc
+  * contrib/hbsqlit3/hbsqlit3.hbc
+  * contrib/hbmagic/hbmagic.hbc
+  * contrib/hbexpat/hbexpat.hbc
+  * contrib/hbblat/hbblat.hbc
+  * contrib/hbqt/qtgui/hbqtgui.hbc
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbc
+  * contrib/hbqt/qtcore/hbqtcore.hbc
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+  * contrib/hbqt/qtuitools/hbqtuitools.hbc
+  * contrib/hbqt/qscintilla/hbqscintilla.hbc
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbc
+  * contrib/hbfbird/hbfbird.hbc
+  * contrib/hbbz2/hbbz2.hbc
+  * contrib/hbnf/hbnf.hbc
+  * contrib/hbmemio/hbmemio.hbc
+  * contrib/hbxpp/hbxpp.hbc
+  * contrib/hbfship/hbfship.hbc
+  * contrib/hbcups/hbcups.hbc
+  * contrib/hbfoxpro/hbfoxpro.hbc
+  * contrib/hbhpdf/hbhpdf.hbc
+  * contrib/hbclipsm/hbclipsm.hbc
+  * contrib/rddads/rddads.hbc
+  * contrib/hbfimage/hbfimage.hbc
+  * contrib/sddodbc/sddodbc.hbc
+  * contrib/hbgd/hbgd.hbc
+  * contrib/hbmisc/hbmisc.hbc
+  * contrib/sddoci/sddoci.hbc
+  * contrib/hbcomm/hbcomm.hbc
+  * contrib/hbtip/hbtipssl.hbc
+  * contrib/hbtip/hbtip.hbc
+  * contrib/hbcairo/hbcairo.hbc
+  * contrib/hbssl/hbssl.hbc
+    * Renamed __HB_DYN__ to _HB_DYNSUFF
+    + Added _HB_DYNPREF
+
+  * contrib/hbcairo/hbcairo.hbc
+    ! Fixed libname when _HB_DYNPREF is set.
+
+  * contrib/hbqt/qtgui/hbqtgui.hbc
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbc
+  * contrib/hbqt/qtcore/hbqtcore.hbc
+  * contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+  * contrib/hbqt/qtuitools/hbqtuitools.hbc
+  * contrib/hbqt/qscintilla/hbqscintilla.hbc
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbc
+    ! Fixed linux static mode when _HB_DYNPREF is set
+    * Changed to use ${hb_name} instead of explicit libname
+
 2011-02-09 14:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Also exclude self from lib list on *nix systems.
diff --git a/harbour/contrib/gtalleg/gtalleg.hbc b/harbour/contrib/gtalleg/gtalleg.hbc
index ebb8f5ff9a..5dade8912a 100644
--- a/harbour/contrib/gtalleg/gtalleg.hbc
+++ b/harbour/contrib/gtalleg/gtalleg.hbc
@@ -2,8 +2,8 @@
 # $Id$
 #
 
-{!HB_STATIC_ALLEGRO}libs=${hb_name}${__HB_DYN__}
-{HB_STATIC_ALLEGRO}libs=${hb_name}s${__HB_DYN__}
+{!HB_STATIC_ALLEGRO}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
+{HB_STATIC_ALLEGRO}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
 
 {!HB_STATIC_ALLEGRO&win}libs=alleg42
 {!HB_STATIC_ALLEGRO&linux}ldflags="`allegro-config --libs`"
diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc
index bc534c9394..4500a4e7ea 100644
--- a/harbour/contrib/gtwvg/gtwvg.hbc
+++ b/harbour/contrib/gtwvg/gtwvg.hbc
@@ -6,7 +6,7 @@ skip={!win}
 
 incpaths=.
 
-gt=${hb_name}${__HB_DYN__}
+gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 libs=../hbwin/hbwin.hbc
 
diff --git a/harbour/contrib/hbblat/hbblat.hbc b/harbour/contrib/hbblat/hbblat.hbc
index 526a8b0748..4028d64ff9 100644
--- a/harbour/contrib/hbblat/hbblat.hbc
+++ b/harbour/contrib/hbblat/hbblat.hbc
@@ -6,5 +6,5 @@ skip={!win}
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=blat
diff --git a/harbour/contrib/hbblink/hbblink.hbc b/harbour/contrib/hbblink/hbblink.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbblink/hbblink.hbc
+++ b/harbour/contrib/hbblink/hbblink.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbbz2/hbbz2.hbc b/harbour/contrib/hbbz2/hbbz2.hbc
index 784b475c69..ad795e2f51 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbc
+++ b/harbour/contrib/hbbz2/hbbz2.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/bz2/bz2.hbc
diff --git a/harbour/contrib/hbcairo/hbcairo.hbc b/harbour/contrib/hbcairo/hbcairo.hbc
index 53ba4cb3b5..d9da232f44 100644
--- a/harbour/contrib/hbcairo/hbcairo.hbc
+++ b/harbour/contrib/hbcairo/hbcairo.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-libs=${hb_name}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
-{!unix}libs=cairo${__HB_DYN__}
+{!unix}libs=cairo
 {unix}ldflags="`pkg-config --libs cairo`"
diff --git a/harbour/contrib/hbclipsm/hbclipsm.hbc b/harbour/contrib/hbclipsm/hbclipsm.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbclipsm/hbclipsm.hbc
+++ b/harbour/contrib/hbclipsm/hbclipsm.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbcomm/hbcomm.hbc b/harbour/contrib/hbcomm/hbcomm.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbcomm/hbcomm.hbc
+++ b/harbour/contrib/hbcomm/hbcomm.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbct/hbct.hbc b/harbour/contrib/hbct/hbct.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbct/hbct.hbc
+++ b/harbour/contrib/hbct/hbct.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbcups/hbcups.hbc b/harbour/contrib/hbcups/hbcups.hbc
index 8d9f555079..ce2382ba99 100644
--- a/harbour/contrib/hbcups/hbcups.hbc
+++ b/harbour/contrib/hbcups/hbcups.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 {unix}libs=cups
diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc
index da6cb79836..727ef580d3 100644
--- a/harbour/contrib/hbcurl/hbcurl.hbc
+++ b/harbour/contrib/hbcurl/hbcurl.hbc
@@ -4,8 +4,8 @@
 
 incpaths=.
 
-{!(HB_STATIC_CURL&!hbdyn)}libs=${hb_name}${__HB_DYN__}
-{ (HB_STATIC_CURL&!hbdyn)}libs=${hb_name}s${__HB_DYN__}
+{!(HB_STATIC_CURL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
+{ (HB_STATIC_CURL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
 
 {!allwin}libs=curl
 { allwin&!(HB_STATIC_CURL&!hbdyn)}libs=libcurl
diff --git a/harbour/contrib/hbexpat/hbexpat.hbc b/harbour/contrib/hbexpat/hbexpat.hbc
index b63c2d0a2f..aaab7c4102 100644
--- a/harbour/contrib/hbexpat/hbexpat.hbc
+++ b/harbour/contrib/hbexpat/hbexpat.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/expat/expat.hbc
diff --git a/harbour/contrib/hbfbird/hbfbird.hbc b/harbour/contrib/hbfbird/hbfbird.hbc
index d817d0e70f..71bc05c46e 100644
--- a/harbour/contrib/hbfbird/hbfbird.hbc
+++ b/harbour/contrib/hbfbird/hbfbird.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=fbclient
diff --git a/harbour/contrib/hbfimage/hbfimage.hbc b/harbour/contrib/hbfimage/hbfimage.hbc
index 9073414b92..cdc4d638c8 100644
--- a/harbour/contrib/hbfimage/hbfimage.hbc
+++ b/harbour/contrib/hbfimage/hbfimage.hbc
@@ -6,5 +6,5 @@ skip={dos}
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=freeimage
diff --git a/harbour/contrib/hbformat/hbformat.hbc b/harbour/contrib/hbformat/hbformat.hbc
index 86f6254c46..ecfc10848a 100644
--- a/harbour/contrib/hbformat/hbformat.hbc
+++ b/harbour/contrib/hbformat/hbformat.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbfoxpro/hbfoxpro.hbc b/harbour/contrib/hbfoxpro/hbfoxpro.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbfoxpro/hbfoxpro.hbc
+++ b/harbour/contrib/hbfoxpro/hbfoxpro.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbfship/hbfship.hbc b/harbour/contrib/hbfship/hbfship.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbfship/hbfship.hbc
+++ b/harbour/contrib/hbfship/hbfship.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc
index 423214b087..9ccc0a483c 100644
--- a/harbour/contrib/hbgd/hbgd.hbc
+++ b/harbour/contrib/hbgd/hbgd.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {win}libs=bgd
 {linux}libs=gd png jpeg freetype m
 {darwin}libs=gd
diff --git a/harbour/contrib/hbgt/hbgt.hbc b/harbour/contrib/hbgt/hbgt.hbc
index 86f6254c46..ecfc10848a 100644
--- a/harbour/contrib/hbgt/hbgt.hbc
+++ b/harbour/contrib/hbgt/hbgt.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbc b/harbour/contrib/hbhpdf/hbhpdf.hbc
index 331a16f154..2d24093c92 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbc
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/libhpdf/libhpdf.hbc
diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbc b/harbour/contrib/hbhttpd/hbhttpd.hbc
index c855f34e21..bb118e4019 100644
--- a/harbour/contrib/hbhttpd/hbhttpd.hbc
+++ b/harbour/contrib/hbhttpd/hbhttpd.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 mt=yes
diff --git a/harbour/contrib/hblzf/hblzf.hbc b/harbour/contrib/hblzf/hblzf.hbc
index de1c83bd45..6ec891855f 100644
--- a/harbour/contrib/hblzf/hblzf.hbc
+++ b/harbour/contrib/hblzf/hblzf.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/liblzf/lzf.hbc
diff --git a/harbour/contrib/hbmagic/hbmagic.hbc b/harbour/contrib/hbmagic/hbmagic.hbc
index 2ac4a4e84a..0b27558f6d 100644
--- a/harbour/contrib/hbmagic/hbmagic.hbc
+++ b/harbour/contrib/hbmagic/hbmagic.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {unix}libs=magic
diff --git a/harbour/contrib/hbmemio/hbmemio.hbc b/harbour/contrib/hbmemio/hbmemio.hbc
index 86f6254c46..ecfc10848a 100644
--- a/harbour/contrib/hbmemio/hbmemio.hbc
+++ b/harbour/contrib/hbmemio/hbmemio.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbmisc/hbmisc.hbc b/harbour/contrib/hbmisc/hbmisc.hbc
index 86f6254c46..ecfc10848a 100644
--- a/harbour/contrib/hbmisc/hbmisc.hbc
+++ b/harbour/contrib/hbmisc/hbmisc.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbmxml/hbmxml.hbc b/harbour/contrib/hbmxml/hbmxml.hbc
index 7df3fad312..ee071a979a 100644
--- a/harbour/contrib/hbmxml/hbmxml.hbc
+++ b/harbour/contrib/hbmxml/hbmxml.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/minixml/mxml.hbc
diff --git a/harbour/contrib/hbmysql/hbmysql.hbc b/harbour/contrib/hbmysql/hbmysql.hbc
index 297f152132..30fbece519 100644
--- a/harbour/contrib/hbmysql/hbmysql.hbc
+++ b/harbour/contrib/hbmysql/hbmysql.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
diff --git a/harbour/contrib/hbmzip/hbmzip.hbc b/harbour/contrib/hbmzip/hbmzip.hbc
index 310856864a..026a923c00 100644
--- a/harbour/contrib/hbmzip/hbmzip.hbc
+++ b/harbour/contrib/hbmzip/hbmzip.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/minizip/minizip.hbc
diff --git a/harbour/contrib/hbnetio/hbnetio.hbc b/harbour/contrib/hbnetio/hbnetio.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbnetio/hbnetio.hbc
+++ b/harbour/contrib/hbnetio/hbnetio.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbnf/hbnf.hbc b/harbour/contrib/hbnf/hbnf.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbnf/hbnf.hbc
+++ b/harbour/contrib/hbnf/hbnf.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbodbc/hbodbc.hbc b/harbour/contrib/hbodbc/hbodbc.hbc
index 80c08fd21c..b13ed9dd4e 100644
--- a/harbour/contrib/hbodbc/hbodbc.hbc
+++ b/harbour/contrib/hbodbc/hbodbc.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {win}libs=odbc32
diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbc b/harbour/contrib/hbpgsql/hbpgsql.hbc
index 0442e1189b..a24db7476a 100644
--- a/harbour/contrib/hbpgsql/hbpgsql.hbc
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {unix}libs=pq
 {!unix}libs=libpq
diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
index d636dc5908..5d58ca8f99 100644
--- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
+++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
@@ -16,10 +16,10 @@ libs=../qtgui/hbqtgui.hbc
 -depcontrol=qscintilla:${HB_WITH_QSCINTILLA}
 
 # NOTE: untested
-{!HB_STATIC_QT}libs=hbqscintilla${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=qscintilla2 QSci_Qt4
 {!HB_STATIC_QT&linux}libs=qscintilla2
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/qscintilla2.framework/qscintilla2
-{HB_STATIC_QT&allwin}libs=hbqscintillas${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqscintilla
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=qscintilla2
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
index 3cb614f230..15e6632cbf 100644
--- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
@@ -11,10 +11,10 @@ incpaths=.
 
 libs=../hbqt_common.hbc
 
-{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtCore4
 {!HB_STATIC_QT&(linux|symbian)}libs=QtCore
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
-{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtcore
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=QtCore
diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc
index 9385be5dfd..7683efa3c7 100644
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc
@@ -12,10 +12,10 @@ incpaths=.
 libs=../qtcore/hbqtcore.hbc
 libs=../qtgui/hbqtgui.hbc
 
-{!HB_STATIC_QT}libs=hbqtdesigner${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtDesigner4
 {!HB_STATIC_QT&linux}libs=QtDesigner
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtDesigner.framework/QtDesigner
-{HB_STATIC_QT&allwin}libs=hbqtdesigners${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtdesigner
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=QtDesigner
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
index fc1a6ef4c2..38afbe5486 100644
--- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
@@ -11,12 +11,12 @@ incpaths=.
 
 libs=../qtcore/hbqtcore.hbc
 
-{!HB_STATIC_QT}libs=hbqtgui${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtGui4
 {!HB_STATIC_QT&(linux|symbian)}libs=QtGui
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
-{HB_STATIC_QT&allwin}libs=hbqtguis${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtgui
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=QtGui
 
 gui=yes
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
index e4589fa651..41b6594bdb 100644
--- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
@@ -11,10 +11,10 @@ incpaths=.
 
 libs=../qtcore/hbqtcore.hbc
 
-{!HB_STATIC_QT}libs=hbqtnetwork${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4
 {!HB_STATIC_QT&(linux|symbian)}libs=QtNetwork
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
-{HB_STATIC_QT&allwin}libs=hbqtnetworks${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtnetwork
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=QtNetwork
diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc
index 8b8ec207c0..1f4a847cf8 100644
--- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc
+++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbc
@@ -11,6 +11,6 @@ incpaths=.
 
 libs=../qtgui/hbqtgui.hbc
 
-libs=hbqtuitools${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT}libs=QtUiTools
 {HB_STATIC_QT&(allwin|linux)}libs=QtUiTools
diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc
index 82431f5d18..a448107849 100644
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc
@@ -13,10 +13,10 @@ libs=../qtcore/hbqtcore.hbc
 libs=../qtgui/hbqtgui.hbc
 libs=../qtnetwork/hbqtnetwork.hbc
 
-{!HB_STATIC_QT}libs=hbqtwebkit${__HB_DYN__}
+{!HB_STATIC_QT}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_STATIC_QT&(allwin|os2)}libs=QtWebKit4
 {!HB_STATIC_QT&(linux|symbian)}libs=QtWebKit
 {!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
-{HB_STATIC_QT&allwin}libs=hbqtwebkits${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtwebkit
+{HB_STATIC_QT&allwin}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
+{HB_STATIC_QT&linux}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_STATIC_QT&(allwin|linux)}libs=QtWebKit
diff --git a/harbour/contrib/hbsms/hbsms.hbc b/harbour/contrib/hbsms/hbsms.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbsms/hbsms.hbc
+++ b/harbour/contrib/hbsms/hbsms.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbc b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
index 79c8ac4fbe..a2597a2343 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbc
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=../3rd/sqlite3/sqlite3.hbc
diff --git a/harbour/contrib/hbssl/hbssl.hbc b/harbour/contrib/hbssl/hbssl.hbc
index 7579ad37af..4fcafb1f74 100644
--- a/harbour/contrib/hbssl/hbssl.hbc
+++ b/harbour/contrib/hbssl/hbssl.hbc
@@ -6,8 +6,8 @@ incpaths=.
 
 skip={dos}
 
-{!(HB_STATIC_OPENSSL&!hbdyn)}libs=${hb_name}${__HB_DYN__}
-{ (HB_STATIC_OPENSSL&!hbdyn)}libs=${hb_name}s${__HB_DYN__}
+{!(HB_STATIC_OPENSSL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
+{ (HB_STATIC_OPENSSL&!hbdyn)}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF}
 
 {unix}libs=ssl crypto
 {os2}libs=openssl ssl crypto libosslfips
diff --git a/harbour/contrib/hbtip/hbtip.hbc b/harbour/contrib/hbtip/hbtip.hbc
index aad66f2300..925097b520 100644
--- a/harbour/contrib/hbtip/hbtip.hbc
+++ b/harbour/contrib/hbtip/hbtip.hbc
@@ -4,6 +4,6 @@
 
 incpaths=.
 
-{!HB_TIP_OPENSSL|dos}libs=${hb_name}${__HB_DYN__}
-{HB_TIP_OPENSSL&!dos}libs=${hb_name}ssl${__HB_DYN__}
+{!HB_TIP_OPENSSL|dos}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
+{HB_TIP_OPENSSL&!dos}libs=${_HB_DYNPREF}${hb_name}ssl${_HB_DYNSUFF}
 {HB_TIP_OPENSSL&!dos}libs=../hbssl/hbssl.hbc
diff --git a/harbour/contrib/hbtip/hbtipssl.hbc b/harbour/contrib/hbtip/hbtipssl.hbc
index 5b988bc298..561bea397a 100644
--- a/harbour/contrib/hbtip/hbtipssl.hbc
+++ b/harbour/contrib/hbtip/hbtipssl.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=../hbssl/hbssl.hbc
diff --git a/harbour/contrib/hbtpathy/hbtpathy.hbc b/harbour/contrib/hbtpathy/hbtpathy.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbtpathy/hbtpathy.hbc
+++ b/harbour/contrib/hbtpathy/hbtpathy.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbunix/hbunix.hbc b/harbour/contrib/hbunix/hbunix.hbc
index f247b5b30a..c7e4cd1759 100644
--- a/harbour/contrib/hbunix/hbunix.hbc
+++ b/harbour/contrib/hbunix/hbunix.hbc
@@ -6,4 +6,4 @@ skip={!unix}
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbwin/hbwin.hbc b/harbour/contrib/hbwin/hbwin.hbc
index 621c2c03eb..22507922f1 100644
--- a/harbour/contrib/hbwin/hbwin.hbc
+++ b/harbour/contrib/hbwin/hbwin.hbc
@@ -6,6 +6,6 @@ skip={!allwin}
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=png
 {wce}libs=sms CellCore
diff --git a/harbour/contrib/hbxbp/hbxbp.hbc b/harbour/contrib/hbxbp/hbxbp.hbc
index 9c3e3ca688..244b3fe2b2 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbc
+++ b/harbour/contrib/hbxbp/hbxbp.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 libs=../hbqt/hbqtcore.hbc
 libs=../hbqt/hbqtgui.hbc
diff --git a/harbour/contrib/hbxdiff/hbxdiff.hbc b/harbour/contrib/hbxdiff/hbxdiff.hbc
index efa51ad56d..b18aa0178c 100644
--- a/harbour/contrib/hbxdiff/hbxdiff.hbc
+++ b/harbour/contrib/hbxdiff/hbxdiff.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=3rd/libxdiff/xdiff.hbc
diff --git a/harbour/contrib/hbxpp/hbxpp.hbc b/harbour/contrib/hbxpp/hbxpp.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/hbxpp/hbxpp.hbc
+++ b/harbour/contrib/hbxpp/hbxpp.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbziparc/hbziparc.hbc b/harbour/contrib/hbziparc/hbziparc.hbc
index a02fc4d200..2ecfdaf7a0 100644
--- a/harbour/contrib/hbziparc/hbziparc.hbc
+++ b/harbour/contrib/hbziparc/hbziparc.hbc
@@ -2,5 +2,5 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=../hbmzip/hbmzip.hbc
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 3993c3e50d..6369ff1bba 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -540,14 +540,14 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, cDynSuffix, cStdErr, cStd
    hb_setenv( "CLIPPERCMD" )
 
    IF cDynSuffix != NIL
-      hb_setenv( "__HB_DYN__", cDynSuffix ) /* Request dll version of Harbour contrib dependencies (the implibs) to be linked (experimental) */
+      hb_setenv( "_HB_DYNSUFF", cDynSuffix ) /* Request dll version of Harbour contrib dependencies (the implibs) to be linked (experimental) */
       hb_setenv( "_HB_BUILD_LIBDYN", "yes" )
 
       IF hb_FileExists( FNameExtSet( cProjectPath, ".hbc" ) )
          cOptionsLibDyn += " " + FNameExtSet( cProjectPath, ".hbc" )
       ENDIF
    ELSE
-      hb_setenv( "__HB_DYN__" )
+      hb_setenv( "_HB_DYNSUFF" )
       hb_setenv( "_HB_BUILD_LIBDYN" )
    ENDIF
 
diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc
index ba2c63b04f..190caed95a 100644
--- a/harbour/contrib/rddads/rddads.hbc
+++ b/harbour/contrib/rddads/rddads.hbc
@@ -12,7 +12,7 @@ incpaths=.
 {HB_DYNLOAD_RDDADS}prgflags=-D__HBDYNLOAD__RDDADS__
 {HB_DYNLOAD_RDDADS}shared=yes
 
-{!HB_DYNLOAD_RDDADS}libs=${hb_name}${__HB_DYN__}
+{!HB_DYNLOAD_RDDADS}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {!HB_DYNLOAD_RDDADS&win&x86}libs=ace32
 {!HB_DYNLOAD_RDDADS&win&x86_64}libs=ace64
 {!HB_DYNLOAD_RDDADS&linux}libs=ace
diff --git a/harbour/contrib/rddbm/rddbm.hbc b/harbour/contrib/rddbm/rddbm.hbc
index 86f6254c46..ecfc10848a 100644
--- a/harbour/contrib/rddbm/rddbm.hbc
+++ b/harbour/contrib/rddbm/rddbm.hbc
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/rddsql/rddsql.hbc b/harbour/contrib/rddsql/rddsql.hbc
index 29bd564988..1e7989e430 100644
--- a/harbour/contrib/rddsql/rddsql.hbc
+++ b/harbour/contrib/rddsql/rddsql.hbc
@@ -4,4 +4,4 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/sddfb/sddfb.hbc b/harbour/contrib/sddfb/sddfb.hbc
index 6057eff2a0..40a487facf 100644
--- a/harbour/contrib/sddfb/sddfb.hbc
+++ b/harbour/contrib/sddfb/sddfb.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=fbclient
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/sddmy/sddmy.hbc b/harbour/contrib/sddmy/sddmy.hbc
index b14a1f3a7d..c48292bab8 100644
--- a/harbour/contrib/sddmy/sddmy.hbc
+++ b/harbour/contrib/sddmy/sddmy.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
 
diff --git a/harbour/contrib/sddoci/sddoci.hbc b/harbour/contrib/sddoci/sddoci.hbc
index 3b829f1943..77b494463f 100644
--- a/harbour/contrib/sddoci/sddoci.hbc
+++ b/harbour/contrib/sddoci/sddoci.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {HB_WITH_OCILIB_WIDE}libs=ocilibw
 {HB_WITH_OCILIB_MIXED}libs=ocilibm
 {!HB_WITH_OCILIB_WIDE&!HB_WITH_OCILIB_MIXED}libs=ociliba
diff --git a/harbour/contrib/sddodbc/sddodbc.hbc b/harbour/contrib/sddodbc/sddodbc.hbc
index 5b5348b7bf..c7c37ca045 100644
--- a/harbour/contrib/sddodbc/sddodbc.hbc
+++ b/harbour/contrib/sddodbc/sddodbc.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {win}libs=odbc32
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/sddpg/sddpg.hbc b/harbour/contrib/sddpg/sddpg.hbc
index 4426fc7fbc..e5b9b9f70f 100644
--- a/harbour/contrib/sddpg/sddpg.hbc
+++ b/harbour/contrib/sddpg/sddpg.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 {unix}libs=pq
 {!unix}libs=libpq
 
diff --git a/harbour/contrib/sddsqlt3/sddsqlt3.hbc b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
index 18403c41db..2ca2b1b6fb 100644
--- a/harbour/contrib/sddsqlt3/sddsqlt3.hbc
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 libs=../3rd/sqlite3/sqlite3.hbc
 
 libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/xhb/xhb.hbc b/harbour/contrib/xhb/xhb.hbc
index fe0ca5d1c4..7c50261287 100644
--- a/harbour/contrib/xhb/xhb.hbc
+++ b/harbour/contrib/xhb/xhb.hbc
@@ -4,7 +4,7 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
 
 # xhb has these as part of core, so we're adding them to emulate it.
 # They are not needed to use xhb lib itself.