diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7bb10a33df..87b3e5ee88 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-08 17:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+  * contrib/hbqt/hbqts.hbp
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+    * HB_QT_STATIC renamed to HB_BUILD_QT_STATIC (INCOMPATIBLE)
+      (may not be final name)
+
+  * contrib/hbqt/hbqt.hbc
+    * Using HB_STATIC_QT envvar to chose to build against static
+      HBQT/QT components. This makes it in sync with rest of
+      contribs.
+
 2010-07-08 17:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
     + Added experimental dependency display in stdalone mode.
@@ -33,7 +48,7 @@
   - contrib/hbssl/hbssls.hbc
     * Merged static .hbc files into "normal" .hbc files. Now static
       mode can be selected by setting HB_STATIC_* to 'yes' or '1'.
-    ; TODO: Rename HB_QT_STATIC to HB_STATIC_QT.
+    ; TODO: Rename HB_QT_STATIC to HB_STATIC_QT. [DONE]
     ; TODO: Document new setting in install.
 
   * contrib/hbssl/tests/test.prg
diff --git a/harbour/INSTALL b/harbour/INSTALL
index daf03d7334..d52ddd4ec6 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -333,9 +333,9 @@ HARBOUR
    locally hosted copy of these packages, where applicable. 'nolocal' will
    explicitly disable using locally hosted copies.
 
-   Some contribs support build mode in which they can be linked _statically_
-   with 3rd party components:
-      HB_QT_STATIC=yes (only meaningful on Windows platform)
+   To enable building libs that build against static version of 3rd party
+   components:
+      HB_QT_BUILD_STATIC=yes (only meaningful on Windows platform)
 
    You can override automatic detection of QT 'moc', 'rcc' and 'uic' tools
    by using HB_QTPATH and optionally HB_QTPOSTFIX envvars, f.e.:
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index b8ba890eaa..7f74d1484d 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -21,7 +21,7 @@ ifneq ($(HB_HAS_QT),)
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
-   ifneq ($(HB_QT_STATIC),)
+   ifneq ($(HB_QT_BUILD_STATIC),)
       ifneq ($(filter $(HB_PLATFORM),win wce),)
          DIRS += hbqts
       endif
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index e80e4b9838..2af49f6640 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -8,17 +8,17 @@ plugins=hbmk2_plugin_qt.hbs
 
 {allwin|os2}libpaths=${HB_WITH_QT}\..\lib
 
-{!HB_QT_STATIC}libs=hbqt hbqtcore hbqtgui hbqtnetwork
-{!HB_QT_STATIC&allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools
-{!HB_QT_STATIC&os2}libs=QtCore4 QtGui4 QtNet4 QtUiTools
-{!HB_QT_STATIC&linux}libs=QtCore QtGui QtNetwork QtUiTools
-{!HB_QT_STATIC&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
-{!HB_QT_STATIC&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
-{!HB_QT_STATIC&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
-{!HB_QT_STATIC&darwin}libs=QtUiTools
-{HB_QT_STATIC&allwin}libs=hbqts hbqtcores hbqtguis hbqtnetworks
-{HB_QT_STATIC&linux}libs=hbqt hbqtcore hbqtgui hbqtnetwork
-{HB_QT_STATIC&(allwin|linux)}libs=QtCore QtGui QtNetwork QtUiTools
+{!HB_STATIC_QT}libs=hbqt hbqtcore hbqtgui hbqtnetwork
+{!HB_STATIC_QT&allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools
+{!HB_STATIC_QT&os2}libs=QtCore4 QtGui4 QtNet4 QtUiTools
+{!HB_STATIC_QT&linux}libs=QtCore QtGui QtNetwork QtUiTools
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
+{!HB_STATIC_QT&darwin}libs=QtUiTools
+{HB_STATIC_QT&allwin}libs=hbqts hbqtcores hbqtguis hbqtnetworks
+{HB_STATIC_QT&linux}libs=hbqt hbqtcore hbqtgui hbqtnetwork
+{HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui QtNetwork QtUiTools
 {allgcc}libs=supc++
 
 {win|os2}hbcppmm=yes
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/hbqtcores.hbp
index 20da913693..d3da49dad7 100644
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC|!allwin}
+-stop{!HB_QT_BUILD_STATIC|!allwin}
 
 hbqtcore.hbp
 
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/hbqtguis.hbp
index f2551bfc49..04ac13dca8 100644
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC|!allwin}
+-stop{!HB_QT_BUILD_STATIC|!allwin}
 
 hbqtgui.hbp
 
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/hbqtnetworks.hbp
index 6913a42846..224e697468 100644
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC|!allwin}
+-stop{!HB_QT_BUILD_STATIC|!allwin}
 
 hbqtnetwork.hbp
 
diff --git a/harbour/contrib/hbqt/hbqts.hbp b/harbour/contrib/hbqt/hbqts.hbp
index 5924b453c5..b12f8585fe 100644
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC|!allwin}
+-stop{!HB_QT_BUILD_STATIC|!allwin}
 
 hbqt.hbp