diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index beef9f5b9c..a4e203c87a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-10-19 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/mpkg_win_uni.bat
+    ! Added .hbs files in contrib roots to unified windows
+      package. In practice this means that the hbmk2 qt plugin
+      will now be shipped with standard distro.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Typo in comment.
+
 2010-10-19 09:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/hbqtgui.ch
     + Added: more constants.
@@ -46,7 +55,7 @@
 2010-10-18 14:10 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idemisc.prg
     + Applied: patch from Viktor. Now .hbm files are available inside
-      list of project files and it also become part of the .hbp if that 
+      list of project files and it also become part of the .hbp if that
       is written back on disk plus for editing purposes.
 
 2010-10-18 21:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat
index 34ee701e91..8fc3ae34b5 100644
--- a/harbour/package/winuni/mpkg_win_uni.bat
+++ b/harbour/package/winuni/mpkg_win_uni.bat
@@ -95,6 +95,7 @@ for /F %%a in ( 'dir /b /ad' ) do (
    echo %%a
    xcopy /y /s %%a\*.hbc     %HB_ABSROOT%contrib\%%a\
    xcopy /y /s %%a\*.def     %HB_ABSROOT%contrib\%%a\
+   xcopy /y /s %%a\*.hbs     %HB_ABSROOT%contrib\%%a\
    xcopy /y /s %%a\tests\*.* %HB_ABSROOT%contrib\%%a\tests\
 )
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index f801f23697..eeb9651acb 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7475,7 +7475,7 @@ STATIC FUNCTION LibExists( hbmk, cDir, cLib, cLibPrefix, cLibExt )
    DO CASE
    CASE hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cPLAT ] $ "win|wce"
       /* NOTE: ld/gcc option -dll-search-prefix isn't taken into account here,
-               So, '<prefix>xxx.dll' format libs won't be found by hbmk. */
+               So, '<prefix>xxx.dll' format libs won't be found by hbmk2. */
       DO CASE
       CASE                                       hb_FileExists( tmp := cDir + "lib" + FNameExtSet( cLib, ".dll.a" ) ) ; RETURN tmp
       CASE                                       hb_FileExists( tmp := cDir +         FNameExtSet( cLib, ".dll.a" ) ) ; RETURN tmp