diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0017513f19..1dcda9b003 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-13 08:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + tests/hbmk.hbm
+    + Added hbmk2 automatic configuration to set warning level to 3.
+
+  * tests/hbdoctst.prg
+    * Minor.
+
+  * contrib/hbdoc2/hbdoc2.hbp
+    + Added output name.
+
+  * contrib/hbnetio/utils/hbnetio.hbp
+    * Commented -DHB_EXTERN option.
+
+  * contrib/hbwin/win_shell.c
+    ! Patch by Tamas Tevesz to fix compilation on newer (>= 0x621)
+      Borland compiler versions.
+
 2010-07-12 18:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idestylesheets.prg
     ! Fixed: main menu colors for navigated prompts.
@@ -24,7 +41,7 @@
 2010-07-12 17:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idebrowse.prg
   * contrib/hbxbp/xbpbrowse.prg
-    % Ratified: many artifacts about vertical navigation, 
+    % Ratified: many artifacts about vertical navigation,
       especially after resizing is affected. Now you can see
       this difference in demoXBP and hbIDE's ideDBU.
 
diff --git a/harbour/contrib/hbdoc2/hbdoc2.hbp b/harbour/contrib/hbdoc2/hbdoc2.hbp
index a7277ea67b..6119e8ae0f 100644
--- a/harbour/contrib/hbdoc2/hbdoc2.hbp
+++ b/harbour/contrib/hbdoc2/hbdoc2.hbp
@@ -2,7 +2,9 @@
 # $Id$
 #
 
--w3 -es2
+-w3 -es2 -l
+
+-o${hb_name}
 
 -nulrdd
 
diff --git a/harbour/contrib/hbnetio/utils/hbnetio.hbp b/harbour/contrib/hbnetio/utils/hbnetio.hbp
index bde34dde92..ca777306f9 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio.hbp
+++ b/harbour/contrib/hbnetio/utils/hbnetio.hbp
@@ -16,4 +16,4 @@ netiocmd.prg
 -ldflag={allmsvc}-dynamicbase
 -ldflag={allmsvc}-fixed:no
 
--prgflag=-DHB_EXTERN
+#-prgflag=-DHB_EXTERN
diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c
index 3b529c443d..789e2a9a60 100644
--- a/harbour/contrib/hbwin/win_shell.c
+++ b/harbour/contrib/hbwin/win_shell.c
@@ -54,16 +54,33 @@
 #undef _WIN32_IE
 #define _WIN32_IE 0x0500 /* request Windows 2000 features for NOTIFYICONDATA */
 
-/* This code uses named union so this declaration is necessary for
- * compilers where nameless unions are default
- */
-#if !defined( NONAMELESSUNION )
-   #define NONAMELESSUNION
-#endif
-
 #include "hbwapi.h"
 #include "hbapiitm.h"
 
+#if defined( __BORLANDC__ )
+#  if !defined( NONAMELESSUNION )
+#     define NONAMELESSUNION
+#  endif
+#  if defined( DUMMYUNIONNAME )
+#     undef DUMMYUNIONNAME
+#  endif
+#  if defined( DUMMYUNIONNAME2 )
+#     undef DUMMYUNIONNAME2
+#  endif
+#  if defined( DUMMYUNIONNAME3 )
+#     undef DUMMYUNIONNAME3
+#  endif
+#  if defined( DUMMYUNIONNAME4 )
+#     undef DUMMYUNIONNAME4
+#  endif
+#  if defined( DUMMYUNIONNAME5 )
+#     undef DUMMYUNIONNAME5
+#  endif
+#  define HB_WIN_U( x, y, z )  x ## . ## y ## . ## z
+#else
+#  define HB_WIN_U( x, y, z )  x ## . ## z
+#endif
+
 #include <shellapi.h>
 
 /* WIN_ShellNotifyIcon( [<hWnd>], [<nUID>], [<nMessage>], [<hIcon>],
@@ -92,7 +109,7 @@ HB_FUNC( WIN_SHELLNOTIFYICON )
    {
       if( HB_ITEMCOPYSTR( hb_param( 7, HB_IT_ANY ), tnid.szInfo, HB_SIZEOFARRAY( tnid.szInfo ) ) > 0 )
          tnid.uFlags |= NIF_INFO;
-      tnid.u.uTimeout = ( UINT ) hb_parni( 8 );
+      HB_WIN_U( tnid, DUMMYUNIONNAME, uTimeout ) = ( UINT ) hb_parni( 8 );
       if( HB_ITEMCOPYSTR( hb_param( 9, HB_IT_ANY ), tnid.szInfoTitle, HB_SIZEOFARRAY( tnid.szInfoTitle ) ) > 0 )
          tnid.uFlags |= NIF_INFO;
       tnid.dwInfoFlags = ( DWORD ) hb_parnl( 10 );
diff --git a/harbour/tests/hbdoctst.prg b/harbour/tests/hbdoctst.prg
index d1992d9345..6d3baf1c90 100644
--- a/harbour/tests/hbdoctst.prg
+++ b/harbour/tests/hbdoctst.prg
@@ -65,7 +65,7 @@ PROCEDURE Main( cRoot )
 
       aEntry := __hbdoc_LoadDir( cDir, cName, aErrMsg )
 
-      /* TODO: apply code formatting, NFDOC section and content validation here.
+      /* TODO: apply code formatting, HBDOC section and content validation here.
                It's also possible to create output generators at this point.
                These generators should simply parse the list of entry hashes
                and spit out output in selected end-user format, like .html
diff --git a/harbour/tests/hbmk.hbm b/harbour/tests/hbmk.hbm
new file mode 100644
index 0000000000..545e05d883
--- /dev/null
+++ b/harbour/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+-w3