diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a8e7236ea7..eb542bbc0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-15 21:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbinit.h
+    ! fixed typo in section name in last commit - thanks to Tamas again
+    * in C++ mode encapsulate startup functions inside
+      'extern "C" { ... }' to eliminate reallocation problems
+
 2009-12-15 21:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbinit.h
     * use more portable asm() directive instead of __asm__()
diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h
index 147a8fc92b..5a691e1bd9 100644
--- a/harbour/include/hbinit.h
+++ b/harbour/include/hbinit.h
@@ -125,13 +125,15 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
       HB_CALL_ON_STARTUP_END( func )
 
    #define HB_CALL_ON_STARTUP_BEGIN( func ) \
+      HB_EXTERN_BEGIN \
       static void func( void ) \
       {
 
    #define HB_CALL_ON_STARTUP_END( func ) \
       } \
       HB_INIT_FUNCTION_REF( func ) \
-      asm ( ".section .init\n\tcall " HB_MACRO2STRING( func ) "\n\t.section .init\n\t" );
+      HB_EXTERN_END \
+      asm ( ".section .init\n\tcall " HB_MACRO2STRING( func ) "\n\t.section .text\n\t" );
 
 
    #define HB_INIT_FUNCTION_REF( func )    \