diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2ad61e507f..65db35b188 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-26 15:21 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/hbmk2.prg
+    * use HB_EXTERN_BEGIN / HB_EXTERN_END macros instead of HB_EXTERN_C
+      in -xhb mode. It fixes the problem with -gui switch.
+
 2010-01-26 14:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.hu_HU.po
   * utils/hbmk2/hbmk2.pt_BR.po
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d10f745f14..3569bc71b5 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3827,7 +3827,13 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   AEval( array, {| tmp | cFile += 'HB_FUNC_EXTERN( ' + tmp + ' );'                + Chr( 10 ) } )
                   IF l_cCMAIN != NIL
                      cFile += ''                                                                  + Chr( 10 )
-                     cFile += 'HB_EXTERN_C void ' + l_cCMAIN + '( void );'                        + 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
                   ENDIF
                   cFile += ''                                                                     + Chr( 10 )
                   cFile += 'void _hb_lnk_ForceLink_hbmk( void )'                                  + Chr( 10 )