diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8422846d0b..da1f3adddb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,26 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-10 22:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+  * contrib/hbqt/hbqts.hbp
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+  * contrib/hbqt/hbqts.hbc
+    % Fixed to avoid building separate, but completely idendical
+      HBQT libs on Linux platform for linking to static QT libs.
+      Please note that on all platforms except Windows and Symbian,
+      it's not necessary to create separate HBQT builds for
+      static and dynamic QT libraries. Instead, on these
+      platforms (Linux, Darwin and possible OS/2) it's enough to
+      just link the same HBQT libs with either static or dynamic
+      QT libs. For this reason, recently added HBQT_ISSTATICLINK()
+      function will only work on Windows, thus it's not portable.
+      It needs to be redesigned to use QT API to retrieve lib type,
+      or if such API doesn't exist, this function should be deleted
+      from Harbour.
+
 2010-06-10 21:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/zlib/deflate.c
   * external/zlib/zutil.c
diff --git a/harbour/INSTALL b/harbour/INSTALL
index ad7d51b14c..f69b5cbf5b 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 linkek _statically_
+   Some contribs support build mode in which they can be linked _statically_
    with 3rd party components:
-      HB_QT_STATIC=yes
+      HB_QT_STATIC=yes (only meaningful on Windows platform)
 
    You can override automatic detection of QT 'moc' tool, f.e.:
       HB_QT_MOC_BIN=/opt/qt46/bin/moc
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/hbqtcores.hbp
index 9d67f9e1c9..20da913693 100644
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC}
+-stop{!HB_QT_STATIC|!allwin}
 
 hbqtcore.hbp
 
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/hbqtguis.hbp
index 26fbec6354..f2551bfc49 100644
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC}
+-stop{!HB_QT_STATIC|!allwin}
 
 hbqtgui.hbp
 
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/hbqtnetworks.hbp
index 9faecc249f..6913a42846 100644
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC}
+-stop{!HB_QT_STATIC|!allwin}
 
 hbqtnetwork.hbp
 
diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc
index e4ceb696c8..7e0d2860a9 100644
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -7,7 +7,8 @@ incpaths=.
 {allwin|os2}libpaths=${HB_WITH_QT}\..\lib
 
 libs=${hb_name}
-libs=hbqtcores hbqtguis hbqtnetworks
+{allwin}libs=hbqtcores hbqtguis hbqtnetworks
+{linux}libs=hbqtcore hbqtgui hbqtnetwork
 
 {allwin|linux}libs=QtCore QtGui QtNetwork QtUiTools
 {allgcc}libs=supc++
diff --git a/harbour/contrib/hbqt/hbqts.hbp b/harbour/contrib/hbqt/hbqts.hbp
index 3154b1e10c..5924b453c5 100644
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
--stop{!HB_QT_STATIC}
+-stop{!HB_QT_STATIC|!allwin}
 
 hbqt.hbp