diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6072fa1584..94092740b3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-29 00:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    % Re-merged Harbour and xhb section in .c stub.
+
+  * TODO
+    * xHarbour -> Harbour.
+
 2010-01-28 23:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rdd/dbfcdx/dbfcdx1.c
     + enabled automatic template order setting in Harbour SIXCDX RDD using
diff --git a/harbour/TODO b/harbour/TODO
index b2dae0185f..5febdb65d0 100644
--- a/harbour/TODO
+++ b/harbour/TODO
@@ -54,7 +54,7 @@ Assign to: Przemek
 Detail...: Define multi platform platform API for GTs which can mix
            graphics objects with standard text output. Now it's
            possible in GTXWC, GTWVG and GTALLEG. This I will discuss
-           yet also with xHarbour developers.
+           yet also with Harbour developers.
 Status...: Open.
 
 ***
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 9ba247b535..5e1f2134f0 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3831,14 +3831,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   cFile += ''                                                                     + Chr( 10 )
                   AEval( array, {| tmp | cFile += 'HB_FUNC_EXTERN( ' + tmp + ' );'                + Chr( 10 ) } )
                   IF l_cCMAIN != NIL
-                     cFile += ''                                                                  + Chr( 10 )
-                     IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
-                        cFile += 'HB_EXTERN_BEGIN'                                                + Chr( 10 ) +;
-                                 'void ' + l_cCMAIN + '( void );'                                 + Chr( 10 ) +;
-                                 'HB_EXTERN_END'                                                  + Chr( 10 )
-                     ELSE
-                        cFile += 'HB_EXTERN_C void ' + l_cCMAIN + '( void );'                     + Chr( 10 )
-                     ENDIF
+                     cFile += ''                                                                  + Chr( 10 ) +;
+                              'HB_EXTERN_BEGIN'                                                   + Chr( 10 ) +;
+                              'void ' + l_cCMAIN + '( void );'                                    + Chr( 10 ) +;
+                              'HB_EXTERN_END'                                                     + Chr( 10 )
                   ENDIF
                   cFile += ''                                                                     + Chr( 10 )
                   cFile += 'void _hb_lnk_ForceLink_hbmk( void )'                                  + Chr( 10 )