diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a80624222d..5dc7f64806 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,28 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-07 14:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/tests/hbqt.hbc
+  * contrib/gtqtc/Makefile
+  * contrib/gtqtc/tests/gtqtc.hbc
+    + If HB_QT_STATIC is set, Harbour build will automatically
+      create a hbqt lib to be used with static qt libs.
+      The static version of hbqt is called hbqts to allow
+      it to exist in parallel with default dynamic version.
+
+  * contrib/hbqt/tests/hbqt.hbc
+    + Added two Windows system libs which are needed for
+      some QT parts (path/dir handling), but aren't part of
+      default hbmk2 Windows system lib list.
+
+  * contrib/gtalleg/Makefile
+  * contrib/gtalleg/tests/gtalleg.hbc
+    + If HB_ALLEGRO_STATIC is set, Harbour build will automatically
+      create a gtalleg lib to be used with static allegro libs.
+      The static version of gtalleg is called gtallegs to allow
+      it to exist in parallel with default dynamic version.
+
 2009-06-07 13:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/tests/hbqt.hbc
   * contrib/gtqtc/tests/gtqtc.hbc
diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile
index eea7e1b89f..7d3fb05fbe 100644
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -24,6 +24,11 @@ HB_INC_ALLEGRO_OK += $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegr
 
 ifneq ($(strip $(HB_INC_ALLEGRO_OK)),)
 
+ifneq ($(HB_ALLEGRO_STATIC),)
+LIBNAME=gtallegs
+HB_USER_CFLAGS += -DALLEGRO_STATICLINK
+endif
+
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d))
 
 C_SOURCES=\
diff --git a/harbour/contrib/gtalleg/tests/gtalleg.hbc b/harbour/contrib/gtalleg/tests/gtalleg.hbc
index 63816a9e71..807c74466d 100644
--- a/harbour/contrib/gtalleg/tests/gtalleg.hbc
+++ b/harbour/contrib/gtalleg/tests/gtalleg.hbc
@@ -2,7 +2,8 @@
 # $Id$
 #
 
-libs=gtalleg
+{!HB_ALLEGRO_STATIC}libs=gtalleg
+{HB_ALLEGRO_STATIC}libs=gtallegs
 
 {win&HB_ALLEGRO_STATIC}libs=alleg_s d3d9 dsound
 {win&!HB_ALLEGRO_STATIC}libs=alleg
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index 05a9485234..5fa89ee3f0 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -57,6 +57,11 @@ endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),)
 
+ifneq ($(HB_QT_STATIC),)
+LIBNAME=gtqtcs
+HB_USER_CFLAGS += -DQT_NODLL
+endif
+
 ifneq ($(strip $(HB_INC_QT_OK)),spec)
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
 endif
diff --git a/harbour/contrib/gtqtc/tests/gtqtc.hbc b/harbour/contrib/gtqtc/tests/gtqtc.hbc
index c5dbf50204..dbbd4e9225 100644
--- a/harbour/contrib/gtqtc/tests/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/tests/gtqtc.hbc
@@ -13,6 +13,7 @@
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
 gui=yes
-gt=gtqtc
+{!HB_QT_STATIC}gt=gtqtc
+{HB_QT_STATIC}gt=gtqtcs
 # optional
 mt=yes
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 830ce3d4be..4326ea3466 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -57,6 +57,11 @@ endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),)
 
+ifneq ($(HB_QT_STATIC),)
+LIBNAME=hbqts
+HB_USER_CFLAGS += -DQT_NODLL
+endif
+
 ifneq ($(strip $(HB_INC_QT_OK)),spec)
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
 endif
diff --git a/harbour/contrib/hbqt/tests/hbqt.hbc b/harbour/contrib/hbqt/tests/hbqt.hbc
index e71bf3d429..c20ba8501f 100644
--- a/harbour/contrib/hbqt/tests/hbqt.hbc
+++ b/harbour/contrib/hbqt/tests/hbqt.hbc
@@ -5,7 +5,9 @@
 {allwin}libpaths=${HB_DIR_QT}\lib
 
 {mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
-libs=hbqt
+{!HB_QT_STATIC}libs=hbqt
+{HB_QT_STATIC}libs=hbqts
+{win}libs=version shlwapi
 {allwin&!HB_QT_STATIC}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {allwin&HB_QT_STATIC}libs=QtCore QtGui QtNetwork QtWebKit
 {linux}libs=QtCore QtGui QtNetwork QtWebKit