diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 37f8465b37..065626d55a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,32 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-29 23:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/qtgui/Makefile
+  * contrib/hbqt/qtcore/Makefile
+  * contrib/hbqt/qtnetwork/Makefile
+    + Enabled HB_QT_STATIC for all OSes.
+
+  * contrib/hbqt/hbqt.hbc
+  * contrib/hbqt/hbqts.hbc
+    - Deleted no more needed special Windows system libs.
+
+  * contrib/hbqt/hbqts.hbc
+    - Deleted webkit libs.
+    + Enabled static libs for linux. (they are named the
+      same as on Windows)
+
+  * contrib/gtwvg/tests/demowvg.hbp
+    ! Missing SVN header.
+    ! Missing SVN props.
+    ! Deleted local system specific absolute paths.
+      TOFIX: HBIDE should make the working (what is it BTW)
+             and destination folders relative to the location
+             of .hbp. BTW destination is redundant, since -o
+             already specifies that.
+    ! Deleted -trace -info. These should be user decisions.
+
 2010-05-29 18:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Shows version of detected packages.
diff --git a/harbour/contrib/gtwvg/tests/demowvg.hbp b/harbour/contrib/gtwvg/tests/demowvg.hbp
index c5a692e7b6..f65e6d51be 100644
--- a/harbour/contrib/gtwvg/tests/demowvg.hbp
+++ b/harbour/contrib/gtwvg/tests/demowvg.hbp
@@ -1,8 +1,12 @@
+#
+# $Id$
+#
+
 -3rd=hbide_version=1.0
 -3rd=hbide_type=Executable
 -3rd=hbide_title=Demo&GTWVG
--3rd=hbide_location=C:\harbour\contrib\gtwvg\tests\
--3rd=hbide_workingfolder=C:\harbour\contrib\gtwvg\tests
+-3rd=hbide_location=
+-3rd=hbide_workingfolder=
 -3rd=hbide_destinationfolder=
 -3rd=hbide_output=demowvg
 -3rd=hbide_launchparams=
@@ -11,15 +15,13 @@
 -3rd=hbide_xhb=NO
 -3rd=hbide_xpp=NO
 -3rd=hbide_clp=NO
- 
+
 -inc
--trace
--info
 -mt
 -w3
 -es2
 -gtwvg
- 
+
 demowvg.prg
 wvgwvtclasses.prg
 wvgtbrowser.prg
@@ -30,4 +32,3 @@ wvgcuigdialog.prg
 wvgxbp.prg
 wvgactivex.prg
 wvgqt.prg
- 
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 18d0d99a16..152143cdec 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -23,10 +23,8 @@ ifneq ($(HB_HAS_QT),)
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      ifneq ($(HB_QT_STATIC),)
-         DIRS += hbqts
-      endif
+   ifneq ($(HB_QT_STATIC),)
+      DIRS += hbqts
    endif
 
    DIRS += \
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index a4151918a1..3289ab4e47 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -9,7 +9,6 @@ incpaths=.
 libs=hbqt
 libs=hbqtcore hbqtgui hbqtnetwork
 
-{win}libs=version shlwapi
 {allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools
 {os2}libs=QtCore4 QtGui4 QtNet4 QtUiTools
 {linux}libs=QtCore QtGui QtNetwork QtUiTools
diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc
index 4635e4f1f8..58cc9562d6 100644
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -7,10 +7,9 @@ incpaths=.
 {allwin|os2}libpaths=${HB_WITH_QT}\..\lib
 
 libs=hbqts
-libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits
+libs=hbqtcores hbqtguis hbqtnetworks
 
-{win}libs=version shlwapi
-{allwin}libs=QtCore QtGui QtNetwork QtWebKit QtUiTools
+{allwin|linux}libs=QtCore QtGui QtNetwork QtUiTools
 {allgcc}libs=supc++
 
 {win|os2}hbcppmm=yes
diff --git a/harbour/contrib/hbqt/qtcore/Makefile b/harbour/contrib/hbqt/qtcore/Makefile
index 6a1bf75f30..7eb5b3a83b 100644
--- a/harbour/contrib/hbqt/qtcore/Makefile
+++ b/harbour/contrib/hbqt/qtcore/Makefile
@@ -18,10 +18,8 @@ ifneq ($(HB_HAS_QT),)
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      ifneq ($(HB_QT_STATIC),)
-         DIRS += qtcores
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
+   ifneq ($(HB_QT_STATIC),)
+      DIRS += qtcores
+      include $(TOP)$(ROOT)config/dir.mk
    endif
 endif
diff --git a/harbour/contrib/hbqt/qtgui/Makefile b/harbour/contrib/hbqt/qtgui/Makefile
index c9930ca718..b65a9bf257 100644
--- a/harbour/contrib/hbqt/qtgui/Makefile
+++ b/harbour/contrib/hbqt/qtgui/Makefile
@@ -20,10 +20,8 @@ ifneq ($(HB_HAS_QT),)
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      ifneq ($(HB_QT_STATIC),)
-         DIRS += qtguis
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
+   ifneq ($(HB_QT_STATIC),)
+      DIRS += qtguis
+      include $(TOP)$(ROOT)config/dir.mk
    endif
 endif
diff --git a/harbour/contrib/hbqt/qtnetwork/Makefile b/harbour/contrib/hbqt/qtnetwork/Makefile
index 332949b4bf..035e4c1d20 100644
--- a/harbour/contrib/hbqt/qtnetwork/Makefile
+++ b/harbour/contrib/hbqt/qtnetwork/Makefile
@@ -20,11 +20,9 @@ ifneq ($(HB_HAS_QT),)
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      ifneq ($(HB_QT_STATIC),)
-         DIRS += qtnetworks
-         include $(TOP)$(ROOT)config/dir.mk
-      endif
+   ifneq ($(HB_QT_STATIC),)
+      DIRS += qtnetworks
+      include $(TOP)$(ROOT)config/dir.mk
    endif
 else
    HB_SKIP_REASON := $(_DET_RES_TEXT)