diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index da29076d6f..ff8bfb1c1f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,24 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+
+2002-01-30 11:30 UTC+0100 Antonio Linares <alinares@fivetech.com>
+
+   * include/hbpcode.h
+   * source/compiler/genc.c
+   * source/compiler/hbfix.c
+   * source/compiler/hbpcode.c
+   * source/vm/hvm.c
+   * source/vm/macro.c
+     + Added support for HB_P_MPUSHSTR
+
+   Notice: These changes have been borrowed from xHarbour,
+   as they fix the bug that xHarbour strings sharing introduced
+   in Harbour (for macro strings).
+   Copyright of this xHarbour bug and bug fix: Ron Pinkas.
+
+   * source/vm/classes.c
+     * source change re-implemented, that was lost cause using
        Viktor classes.c
 
 2002-01-30 12:30 UTC+0200 Chen Kedem <niki@actcom.co.il>
diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c
index f7b6871a7f..e8a7d6ecc1 100644
--- a/harbour/source/vm/arrayshb.c
+++ b/harbour/source/vm/arrayshb.c
@@ -323,7 +323,7 @@ HB_FUNC( HB_AEXPRESSIONS )
 
    if( pLine == NULL )
    {
-      hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, "HB_AEXPRESSIONS", 1, hb_paramError(1) );
+      hb_errRT_BASE_SubstR( EG_ARG, 9999, NULL, "HB_AEXPRESSIONS", 1, hb_paramError(1) );
       return;
    }
 
@@ -408,4 +408,3 @@ HB_FUNC( HB_AEXPRESSIONS )
       hb_itemRelease( pExp );
    }
 }
-
diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c
index 24e581169f..88ea5e284f 100644
--- a/harbour/source/vm/extend.c
+++ b/harbour/source/vm/extend.c
@@ -793,4 +793,4 @@ void HB_EXPORT hb_stornd( double dNumber, int iParam, ... )
       else if( bByRef || iParam == -1 )
          hb_itemPutND( pItem, dNumber );
    }
-}
\ No newline at end of file
+}
diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c
index 3b6a8a6310..c5bec1b84f 100644
--- a/harbour/source/vm/itemapi.c
+++ b/harbour/source/vm/itemapi.c
@@ -1311,4 +1311,4 @@ PHB_ITEM hb_itemValToStr( PHB_ITEM pItem )
       hb_xfree( buffer );
 
    return pResult;
-}
\ No newline at end of file
+}
diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c
index 9a7c62037a..7bc785a77f 100644
--- a/harbour/source/vm/macro.c
+++ b/harbour/source/vm/macro.c
@@ -140,7 +140,7 @@ static BOOL hb_macroCheckParam( HB_ITEM_PTR pItem )
 
    if( ! HB_IS_STRING(pItem) )
    {
-      HB_ITEM_PTR pResult = hb_errRT_BASE_Subst( EG_ARG, 1080, NULL, "&", 0 );
+      HB_ITEM_PTR pResult = hb_errRT_BASE_Subst( EG_ARG, 1065, NULL, "&", 0 );
 
       bValid = FALSE;
       if( pResult )
@@ -1550,5 +1550,3 @@ void hb_compCodeBlockEnd( HB_MACRO_DECL )
    hb_xfree( ( void * ) pCodeblock->pCode );
    hb_xfree( ( void * ) pCodeblock );
 }
-
-
diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c
index 8812ad4f06..6cc26d3801 100644
--- a/harbour/source/vm/memvars.c
+++ b/harbour/source/vm/memvars.c
@@ -1403,6 +1403,7 @@ HB_FUNC( __MVSAVE )
       }
    }
    else
+      /* NOTE: Undocumented error message in CA-Cl*pper 5.2e and 5.3x. [ckedem] */
       hb_errRT_BASE( EG_ARG, 2008, NULL, "__MSAVE", 3, hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
 }
 
@@ -1541,6 +1542,7 @@ HB_FUNC( __MVRESTORE )
          hb_retl( FALSE );
    }
    else
+      /* NOTE: Undocumented error message in CA-Cl*pper 5.2e and 5.3x. [ckedem] */
       hb_errRT_BASE( EG_ARG, 2007, NULL, "__MRESTORE", 2, hb_paramError( 1 ), hb_paramError( 2 ) );
 }