diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fc5f212d3b..dab31d0f6b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,22 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2005-10-30 14:50 UTC+0200 Chen Kedem <niki@actcom.co.il>
+   * doc/dirstruc.txt
+     + Add oneliner description for: source/rdd/hbsix, source/rdd/hsx
+
+   * doc/en/lang.txt
+     + Added the following to HB_LANGSELECT() list of supported ID's:
+       BG866, BGISO, BGWIN, HUISO
+     + Added the following to HB_SETCODEPAGE() list of supported ID's:
+       BG866, BGISO, BGWIN, ESMWIN, HUISO
+     * Change the following to HB_SETCODEPAGE() list of supported ID's:
+       PT --> PT850, RUWIN --> RU1251
+
+   * source/lang/msghe862.c
+   * source/lang/msghewin.c
+     * Update startup code to work with MSC
+
 2005-10-28 10:23 UTC+0100 Viktor Szakats (viktor.szakats/syenar.hu)
    * hrbdll.bc
    * hrbdll.vc
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index 74d5c9dccb..2709d5f174 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -206,6 +206,10 @@ in order to remove empty directories)
 |   |   |
 |   |   +---dbfntx     - DBFNTX RDD.
 |   |   |
+|   |   +---hbsix      - SIX compatible functions.
+|   |   |
+|   |   +---hsx        - HiPer-SEEK / CFTS compatible library.
+|   |   |
 |   |   +---nulsys     - NULL RDD.
 |   |
 |   +---rtl            - Run-Time libraries functions and various General
diff --git a/harbour/doc/en/lang.txt b/harbour/doc/en/lang.txt
index 4368c37e55..ed8e837408 100644
--- a/harbour/doc/en/lang.txt
+++ b/harbour/doc/en/lang.txt
@@ -167,6 +167,9 @@
  *      <table>
  *      Language              Codepage       <cNewLang>
  *
+ *      Bulgarian             866            BG866
+ *      Bulgarian             ISO-8859-5     BGISO
+ *      Bulgarian             Windows-1251   BGWIN
  *      Basque                850            EU
  *      Catalan               850            CA
  *      Chinese Simplified    936            ZHGB
@@ -189,6 +192,7 @@
  *      Hebrew                Windows-1255   HEWIN
  *      Hungarian             852            HU852
  *      Hungarian             CWI-2          HUCWI
+ *      Hungarian             ISO-8859-2     HUISO
  *      Hungarian             Windows-1      HUWIN
  *      Icelandic             850            IS850
  *      Indonesian            437            ID
@@ -272,29 +276,34 @@
  *      <table>
  *      Language              Codepage       <cNewLang>
  *
+ *      Bulgarian             866            BG866
+ *      Bulgarian             ISO-8859-5     BGISO
+ *      Bulgarian             Windows-1251   BGWIN
  *      English               437            EN
  *      German                850            DE
- *      German ANSI           ANSI           DEWIN
+ *      German                ISO-8859-1     DEWIN
  *      Greek                 737            EL
- *      Greek ANSI            Windows-1253   ELWIN
+ *      Greek                 Windows-1253   ELWIN
  *      Hungarian             852            HU852
- *      Hungarian             Windows-1      HUWIN
+ *      Hungarian             ISO-8859-2     HUISO
+ *      Hungarian             Windows-1250   HUWIN
  *      Polish                852            PL852
  *      Polish                ISO-8859-2     PLISO
  *      Polish                Mozowia        PLMAZ
  *      Polish                Windows-1250   PLWIN
- *      Portuguese            850            PT
+ *      Portuguese            850            PT850
  *      Portuguese            ISO-8859-1     PTISO
  *      Russian               866            RU866
  *      Russian               KOI-8          RUKOI8
- *      Russian               Windows-1251   RUWIN
+ *      Russian               Windows-1251   RU1251
  *      Serbian               Windows-1251   SRWIN
  *      Slovenian             437            SL437
  *      Slovenian             852            SL852
  *      Slovenian             ISO-8859-2     SLISO
  *      Slovenian             Windows-1250   SLWIN
  *      Spanish               850            ES
- *      Spanish ANSI          ANSI           ESWIN
+ *      Spanish               ISO-8859-1     ESWIN
+ *      Spanish Modern        ISO-8859-1     ESMWIN
  *      </table>
  *  $RETURNS$
  *      <cOldLang>   The old language indentifier
@@ -390,4 +399,3 @@
  *      HB_LANGSELECT(),HB_SETCODEPAGE(),NATIONMSG(),REQUEST
  *  $END$
  */
-
diff --git a/harbour/source/lang/msghe862.c b/harbour/source/lang/msghe862.c
index 909a631cd0..c380ad5bcf 100644
--- a/harbour/source/lang/msghe862.c
+++ b/harbour/source/lang/msghe862.c
@@ -158,9 +158,9 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "‰˜ˆŽ˜” Œ™ ‰…‚™ ˜”‘Ž",
       "Š˜’ŽŒ „™‰‚",
       "array assign",
+      "‰…‚™ Š˜’Ž Œƒ…‚",
       "Š˜’Ž €Œ",
       "conditional",
 
@@ -196,8 +196,8 @@ static HB_LANG s_lang =
       /* Texts */
 
       "DD-MM-YYYY",
-      "Y",
-      "N"
+      "‹",
+      "Œ"
    }
 };
 
@@ -206,6 +206,16 @@ HB_LANG_ANNOUNCE( HE862 );
 HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HE862 )
    hb_langRegister( &s_lang );
 HB_CALL_ON_STARTUP_END( hb_lang_Init_HE862 )
-#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+
+#if defined(HB_PRAGMA_STARTUP)
    #pragma startup hb_lang_Init_HE862
+#elif defined(HB_MSC_STARTUP)
+   #if _MSC_VER >= 1010
+      #pragma data_seg( ".CRT$XIY" )
+      #pragma comment( linker, "/Merge:.CRT=.data" )
+   #else
+      #pragma data_seg( "XIY" )
+   #endif
+   static HB_$INITSYM hb_vm_auto_hb_lang_Init_HE862 = hb_lang_Init_HE862;
+   #pragma data_seg()
 #endif
diff --git a/harbour/source/lang/msghewin.c b/harbour/source/lang/msghewin.c
index cf7bb9c1c7..b101352602 100644
--- a/harbour/source/lang/msghewin.c
+++ b/harbour/source/lang/msghewin.c
@@ -158,9 +158,9 @@ static HB_LANG s_lang =
       "",
       "",
       "",
-      "ξρτψ ωβει ωμ τψξθψιν",
       "βιωδ μξςψκ",
       "array assign",
+      "βεγμ ξςψκ ωβει",
       "μΰ ξςψκ",
       "conditional",
 
@@ -206,6 +206,16 @@ HB_LANG_ANNOUNCE( HEWIN );
 HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HEWIN )
    hb_langRegister( &s_lang );
 HB_CALL_ON_STARTUP_END( hb_lang_Init_HEWIN )
-#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+
+#if defined(HB_PRAGMA_STARTUP)
    #pragma startup hb_lang_Init_HEWIN
+#elif defined(HB_MSC_STARTUP)
+   #if _MSC_VER >= 1010
+      #pragma data_seg( ".CRT$XIY" )
+      #pragma comment( linker, "/Merge:.CRT=.data" )
+   #else
+      #pragma data_seg( "XIY" )
+   #endif
+   static HB_$INITSYM hb_vm_auto_hb_lang_Init_HEWIN = hb_lang_Init_HEWIN;
+   #pragma data_seg()
 #endif