diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dc4b052627..7425c3096f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-16 00:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * use -n2 as default harbour compiler parameter in hb* scripts
+
+  * harbour/include/hbinit.h
+    * added error messages when some mixed forms of startup initialization
+      are defined
+
 2009-12-16 00:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/hb-func.sh
     * use -n2 as default harbour compiler parameter in hb* scripts
diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h
index 5a691e1bd9..4476cfaeeb 100644
--- a/harbour/include/hbinit.h
+++ b/harbour/include/hbinit.h
@@ -114,6 +114,10 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 
 #elif defined( HB_INITSEG_STARTUP )
 
+   #if defined( HB_PRAGMA_STARTUP ) || defined( HB_DATASEG_STARTUP )
+      #error Wrong macros set for startup code - clean your make/env settings.
+   #endif
+
    #define HB_INIT_SYMBOLS_BEGIN( func ) \
       static HB_SYMB symbols_table[] = {
 
@@ -145,7 +149,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 
 #elif defined( __GNUC__ ) || defined( __SUNPRO_C ) || defined( __SUNPRO_CC )
 
-   #if defined( HB_PRAGMA_STARTUP ) ||  defined( HB_MSC_STARTUP )
+   #if defined( HB_PRAGMA_STARTUP ) || defined( HB_DATASEG_STARTUP )
       #error Wrong macros set for startup code - clean your make/env settings.
    #endif
 
@@ -169,6 +173,10 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 
 #elif defined( HB_MSC_STARTUP )
 
+   #if defined( HB_PRAGMA_STARTUP )
+      #error Wrong macros set for startup code - clean your make/env settings.
+   #endif
+
    #define HB_DATASEG_STARTUP
 
    #if _MSC_VER >= 1010
@@ -209,7 +217,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 
 #elif defined( HB_STATIC_STARTUP ) || defined( __cplusplus )
 
-   #if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP )
+   #if defined( HB_PRAGMA_STARTUP ) || defined( HB_DATASEG_STARTUP )
       #error Wrong macros set for startup code - clean your make/env settings.
    #endif
 
@@ -237,7 +245,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 #elif defined( HB_PRAGMA_STARTUP ) || \
       defined( __BORLANDC__ ) || defined( __LCC__ ) || defined( __POCC__ ) || defined( __XCC__ )
 
-   #if defined( HB_MSC_STARTUP )
+   #if defined( HB_DATASEG_STARTUP )
       #error Wrong macros set for startup code - clean your make/env settings.
    #endif
 
@@ -265,6 +273,10 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
 
 #elif defined( __WATCOMC__ )
 
+   #if defined( HB_PRAGMA_STARTUP )
+      #error Wrong macros set for startup code - clean your make/env settings.
+   #endif
+
    #define HB_INIT_SYMBOLS_BEGIN( func ) \
       static HB_SYMB symbols_table[] = {