diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e649a167bd..7fd90265a6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,32 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-01 00:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbblat/hbblat.hbp
+  + contrib/hbqt/gtqtc/gtqtc.hbp
+  + contrib/hbqt/gtqtc/gtqtcs.hbp
+  + contrib/hbblink/hbblink.hbp
+  + contrib/hbnf/hbnf.hbp
+  + contrib/hbmemio/hbmemio.hbp
+  + contrib/hbfship/hbfship.hbp
+  + contrib/hbnetio/hbnetio.hbp
+  + contrib/gtwvg/gtwvg.hbp
+  + contrib/hbmisc/hbmisc.hbp
+  + contrib/hbbtree/hbbtree.hbp
+    + Added hbmk2 make files.
+    ; NOTE: I intend to move hbbtree to the examples section.
+            It has unfixed portability problems since long time.
+
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/detect.mk
+    ! Fixed key header name after last changes.
+
+  * contrib/hbqt/hbqts.hbp
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+    + Skipping build if HB_QT_STATIC is not set.
+
 2010-05-31 22:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/xhberr.prg
     ! fixed reporting information about workareas in error.log file
diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp
new file mode 100644
index 0000000000..6779cea5a8
--- /dev/null
+++ b/harbour/contrib/gtwvg/gtwvg.hbp
@@ -0,0 +1,55 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+-stop{!win}
+
+../hbwin/hbwin.hbc
+
+# Optimize build time and make sure we build even with this option
+-cflag=-DWIN32_LEAN_AND_MEAN
+
+gtwvg.c
+wvgcore.c
+wvgutils.c
+wvgwin.c
+wvgwing.c
+wvgsink.c
+wvggui.c
+wvgcuig.c
+
+wvgclass.prg
+wvgpaint.prg
+wvgphdlr.prg
+wvgwnd.prg
+wvgcrt.prg
+wvgax.prg
+wvgdlg.prg
+wvgmenub.prg
+wvgtoolb.prg
+wvgcombo.prg
+wvglistb.prg
+wvgpushb.prg
+wvgstatb.prg
+wvgstatc.prg
+wvgtreev.prg
+wvgcheck.prg
+wvgdatar.prg
+wvgradio.prg
+wvg3stat.prg
+wvgbitmp.prg
+wvgsle.prg
+wvgmle.prg
+wvghtmlv.prg
+wvgsysw.prg
+wvgdarea.prg
+wvgscrlb.prg
+wvgtabpg.prg
diff --git a/harbour/contrib/hbblat/hbblat.hbp b/harbour/contrib/hbblat/hbblat.hbp
new file mode 100644
index 0000000000..30dc644d07
--- /dev/null
+++ b/harbour/contrib/hbblat/hbblat.hbp
@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+-stop{!win}
+
+blatwrp.c
+blatcls.prg
diff --git a/harbour/contrib/hbblink/hbblink.hbp b/harbour/contrib/hbblink/hbblink.hbp
new file mode 100644
index 0000000000..51fc9a19e9
--- /dev/null
+++ b/harbour/contrib/hbblink/hbblink.hbp
@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+blinker.prg
diff --git a/harbour/contrib/hbbtree/hbbtree.hbp b/harbour/contrib/hbbtree/hbbtree.hbp
new file mode 100644
index 0000000000..216d3c02db
--- /dev/null
+++ b/harbour/contrib/hbbtree/hbbtree.hbp
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+hb_btree.c
+tbtree.prg
diff --git a/harbour/contrib/hbfship/hbfship.hbp b/harbour/contrib/hbfship/hbfship.hbp
new file mode 100644
index 0000000000..b794cac1dc
--- /dev/null
+++ b/harbour/contrib/hbfship/hbfship.hbp
@@ -0,0 +1,15 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+pvalue.c
+secondfs.c
+strpeek.c
diff --git a/harbour/contrib/hbmemio/hbmemio.hbp b/harbour/contrib/hbmemio/hbmemio.hbp
new file mode 100644
index 0000000000..71737bfec1
--- /dev/null
+++ b/harbour/contrib/hbmemio/hbmemio.hbp
@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+memio.c
diff --git a/harbour/contrib/hbmisc/hbmisc.hbp b/harbour/contrib/hbmisc/hbmisc.hbp
new file mode 100644
index 0000000000..fdde04e698
--- /dev/null
+++ b/harbour/contrib/hbmisc/hbmisc.hbp
@@ -0,0 +1,29 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+dates2.c
+ffind.c
+hb_f.c
+hbeditc.c
+spd.c
+strfmt.c
+stringsx.c
+
+calldll.prg
+fcomma.prg
+fileread.prg
+hbedit.prg
+nconvert.prg
+numtxthu.prg
+numtxten.prg
+stringp.prg
+twirler.prg
diff --git a/harbour/contrib/hbnetio/hbnetio.hbp b/harbour/contrib/hbnetio/hbnetio.hbp
new file mode 100644
index 0000000000..24fc4739c7
--- /dev/null
+++ b/harbour/contrib/hbnetio/hbnetio.hbp
@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+netiosrv.c
+netiocli.c
+
+netiomt.prg
diff --git a/harbour/contrib/hbnf/hbnf.hbp b/harbour/contrib/hbnf/hbnf.hbp
new file mode 100644
index 0000000000..fa6524b225
--- /dev/null
+++ b/harbour/contrib/hbnf/hbnf.hbp
@@ -0,0 +1,152 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+
+-w3 -es2
+
+alt.c
+caplock.c
+chdir.c
+color2n.c
+ctrl.c
+descendn.c
+dispc.c
+ftattr.c
+ftidle.c
+ftisprn.c
+fttext.c
+ftshadow.c
+getenvrn.c
+getver.c
+getvid.c
+iamidle.c
+kspeed.c
+mkdir.c
+mouse.c
+n2color.c
+numlock.c
+origin.c
+proper.c
+prtscr.c
+putkey.c
+rmdir.c
+setkeys.c
+setlastk.c
+shift.c
+stod.c
+
+# BAD_C_SOURCES
+#ontick.c
+#peek.c
+#poke.c
+
+aading.prg
+aavg.prg
+acctadj.prg
+acctmnth.prg
+acctqtr.prg
+acctweek.prg
+acctyear.prg
+adessort.prg
+aemaxlen.prg
+aeminlen.prg
+amedian.prg
+anomatch.prg
+any2any.prg
+aredit.prg
+asum.prg
+at2.prg
+bitclr.prg
+bitset.prg
+blink.prg
+byt2bit.prg
+byt2hex.prg
+byteand.prg
+byteneg.prg
+bytenot.prg
+byteor.prg
+bytexor.prg
+calendar.prg
+clrsel.prg
+cntryset.prg
+d2e.prg
+datecnfg.prg
+dayofyr.prg
+daytobow.prg
+dectobin.prg
+dfile.prg
+diskfunc.prg
+dispmsg.prg
+dosver.prg
+e2d.prg
+easter.prg
+elapmil.prg
+elapsed.prg
+eltime.prg
+findith.prg
+firstday.prg
+floptst.prg
+gcd.prg
+hex2dec.prg
+invclr.prg
+isbit.prg
+isbiton.prg
+isshare.prg
+lastday.prg
+linked.prg
+madd.prg
+menu1.prg
+menutonf.prg
+metaph.prg
+miltime.prg
+min2dhm.prg
+month.prg
+mouse2.prg
+netpv.prg
+nooccur.prg
+ntow.prg
+nwlstat.prg
+nwsem.prg
+nwuid.prg
+page.prg
+pchr.prg
+pegs.prg
+pending.prg
+pickday.prg
+popadder.prg
+prtesc.prg
+pvid.prg
+qtr.prg
+rand1.prg
+restsets.prg
+ftround.prg
+savearr.prg
+savesets.prg
+scancode.prg
+scregion.prg
+setdate.prg
+settime.prg
+sinkey.prg
+sleep.prg
+sqzn.prg
+sysmem.prg
+tbwhile.prg
+tempfile.prg
+vertmenu.prg
+vidcur.prg
+vidmode.prg
+wda.prg
+week.prg
+workdays.prg
+woy.prg
+xbox.prg
+year.prg
+
+# BAD_PRG_SOURCES
+#mouse1.prg
diff --git a/harbour/contrib/hbqt/detect.mk b/harbour/contrib/hbqt/detect.mk
index 6801dabba3..f94459a468 100644
--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -16,7 +16,7 @@ _DET_VAR_HAS_ := HB_HAS_QT
 _DET_FLT_PLAT := !dos
 _DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
 _DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-_DET_INC_HEAD := /QtCore/QObject
+_DET_INC_HEAD := /QtCore/qglobal.h
 include $(TOP)$(ROOT)config/detfun.mk
 
 _QT_DARWIN :=
diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp
new file mode 100644
index 0000000000..a3f7ac6e76
--- /dev/null
+++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp
@@ -0,0 +1,15 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+gtqtc.cpp
+
+-pi=gtqtc.h
+
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
+
diff --git a/harbour/contrib/hbqt/gtqtc/gtqtcs.hbp b/harbour/contrib/hbqt/gtqtc/gtqtcs.hbp
new file mode 100644
index 0000000000..2811d207dd
--- /dev/null
+++ b/harbour/contrib/hbqt/gtqtc/gtqtcs.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!HB_QT_STATIC}
+
+gtqtc.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DQT_NODLL
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 488075044d..facf67f3a5 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -12,7 +12,7 @@
 
 -plugin=plug_moc.prg
 
-{!darwin|HB_WITH_QT}-reqheader=QtCore/QObject
+{!darwin|HB_WITH_QT}-reqheader=QtCore/qglobal.h
 {!darwin|HB_WITH_QT}-inctrypath=${HB_WITH_QT}
 {!darwin}-inctrypath=/usr/include/qt4
 {!darwin}-inctrypath=/usr/lib/qt4/include
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/hbqtcores.hbp
index e3ddf0e99d..9d67f9e1c9 100644
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-stop{!HB_QT_STATIC}
+
 hbqtcore.hbp
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/hbqtguis.hbp
index 7f9a63527b..26fbec6354 100644
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-stop{!HB_QT_STATIC}
+
 hbqtgui.hbp
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/hbqtnetworks.hbp
index a2b83d762f..9faecc249f 100644
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-stop{!HB_QT_STATIC}
+
 hbqtnetwork.hbp
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqts.hbp b/harbour/contrib/hbqt/hbqts.hbp
index e63d09cd45..3154b1e10c 100644
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-stop{!HB_QT_STATIC}
+
 hbqt.hbp
 
 -o${hb_name}