diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5b98c0817d..c9f1e30c47 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-05 19:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added disctinctive static text which is always linked in
+      when C++ mm override is active. This makes it easy to
+      verify if C++ mm override is activated in an executable.
+
+  * ChangeLog
+    ! Fixed messed text in latest hbmk2 changes.
+
 2010-01-05 18:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.pt_BR.po
   * utils/hbmk2/hbmk2.hu_HU.po
@@ -26,10 +35,14 @@
       means that C++ compilation mode is now enforced by using .cpp
       extension. This also means that it's now possible to build
       mixed mode projects with both C and C++ input files.
-      Enable with option: -hbcppmm (cmdline) or hbcppmm=yes (in .hbc files)
-         NOTE: Suggestions for better names are welcome.
       In general, this feature makes -cpp option unnecessary, its
       only purpose now is to override default mode.
+    + Added option to override standard C++ memory management functions
+      with Harbour ones.
+         Enable with option: -hbcppmm (cmdline) or hbcppmm=yes (in .hbc files)
+      NOTE1: Suggestions for better names are welcome.
+      NOTE2: hbide will now crash with mingw if this option is enabled.
+             Any idea why?
     ; Please test.
 
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 245580a4dd..e360b8483a 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3874,6 +3874,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                         ''                                                                        + Chr( 10 ) +;
                         '#if defined( __cplusplus )'                                              + Chr( 10 ) +;
                         ''                                                                        + Chr( 10 ) +;
+                        'const char * __hbmk2_hbcppmm( void )'                                    + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   return "HBCPPMM";'                                                    + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
                         'void * operator new[]( size_t nSize )'                                   + Chr( 10 ) +;
                         '{'                                                                       + Chr( 10 ) +;
                         '   return hb_xgrab( nSize );'                                            + Chr( 10 ) +;