diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ee4d592790..5a8e96d825 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,17 @@
+19991112-01:35 GMT+1 Victor Szel <info@szelvesz.hu>
+   * config/w32/mingw32.cf
+     - "-g" switch removed, so now no debug info will be included by default.
+       This makes the generated binaries to be much smaller, and the make 
+       process mych faster. 
+       WARNING! If you need the debug functionality please use the C_USR=-g 
+       envvar.
+     ! Fixed comment explaining why the USER32 lib is needed.
+   + source/rtl/natmsg/msgzhbig.c 
+   + source/rtl/natmsg/msgzhgb.c 
+   * source/rtl/msgxxx.c
+     + Chinese-GB and Chinese-BIG5 Language Modules added
+       Thanks to Dongming Wang <dongming@km169.net>
+
 19991111-22:52 GMT+1 Victor Szel <info@szelvesz.hu>
    * source/vm/dymsym.c
      % hb_dynsymGet(), hb_dynsymFindName() - Further optimized, toupper() calls
diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf
index 288db42d71..0bcd86fb78 100644
--- a/harbour/config/w32/mingw32.cf
+++ b/harbour/config/w32/mingw32.cf
@@ -13,7 +13,7 @@ CC = gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE) -mno-cygwin
-CFLAGS = -Wall -g
+CFLAGS = -Wall
 
 LD = gcc
 LD_OUT = -o
@@ -32,7 +32,7 @@ endif
 
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
-# This library is needed for kbhit() and getch() support.
+# This library is needed for CharToOemBuff() and OemToCharBuff() support.
 LINKLIBS += -luser32
 
 # If LIBS specifies the rdd library, add all DB drivers.
diff --git a/harbour/source/rtl/msgxxx.c b/harbour/source/rtl/msgxxx.c
index e2e89d7d3b..298cd1172a 100644
--- a/harbour/source/rtl/msgxxx.c
+++ b/harbour/source/rtl/msgxxx.c
@@ -83,6 +83,10 @@
    #include "natmsg/msghe862.c"
 #elif defined(HARBOUR_LANGUAGE_HEWIN)
    #include "natmsg/msghewin.c"
+#elif defined(HARBOUR_LANGUAGE_ZHGB)
+   #include "natmsg/msgzhgb.c"
+#elif defined(HARBOUR_LANGUAGE_ZHBIG)
+   #include "natmsg/msgzhbig.c"
 #else
    #include "natmsg/msgen.c"
 #endif
diff --git a/harbour/source/rtl/natmsg/msgzhbig.c b/harbour/source/rtl/natmsg/msgzhbig.c
new file mode 100644
index 0000000000..bcfaf6b662
--- /dev/null
+++ b/harbour/source/rtl/natmsg/msgzhbig.c
@@ -0,0 +1,92 @@
+/*
+ * $Id$
+ */
+
+/* Language Support Module */
+
+/* Language name: Chinese-BIG5 */
+/* ISO language code (2 chars): ZH */
+/* Codepage: ???? */
+
+#include "hbdefs.h"
+
+char *hb_monthsname[ 12 ] =
+{
+   "る",
+   "る",
+   "る",
+   "る",
+   "きる",
+   "せる",
+   "る",
+   "る",
+   "る",
+   "る",
+   "る",
+   "る"
+};
+
+char *hb_daysname[ 7 ] =
+{
+   "琍戳ら",
+   "琍戳",
+   "琍戳",
+   "琍戳",
+   "琍戳",
+   "琍戳き",
+   "琍戳せ"
+};
+
+char *hb_errorsGeneric[] =
+{
+   "Unknown error",
+   "Argument error",
+   "Bound error",
+   "String overflow",
+   "Numeric overflow",
+   "Zero divisor",
+   "Numeric error",
+   "Syntax error",
+   "Operation too complex",
+   "",
+   "",
+   "Memory low",
+   "Undefined function",
+   "No exported method",
+   "Variable does not exist",
+   "Alias does not exist",
+   "No exported variable",
+   "Illegal characters in alias",
+   "Alias already in use",
+   "",
+   "Create error",
+   "Open error",
+   "Close error",
+   "Read error",
+   "Write error",
+   "Print error",
+   "",
+   "",
+   "",
+   "",
+   "Operation not supported",
+   "Limit exceeded",
+   "Corruption detected",
+   "Data type error",
+   "Data width error",
+   "Workarea not in use",
+   "Workarea not indexed",
+   "Exclusive required",
+   "Lock required",
+   "Write not allowed",
+   "Append lock failed",
+   "Lock Failure",
+   "",
+   "",
+   "",
+   "Incorrect number of arguments",
+   "array access",
+   "array assign",
+   "not an array",
+   "conditional"
+};
diff --git a/harbour/source/rtl/natmsg/msgzhgb.c b/harbour/source/rtl/natmsg/msgzhgb.c
new file mode 100644
index 0000000000..70ce6ef443
--- /dev/null
+++ b/harbour/source/rtl/natmsg/msgzhgb.c
@@ -0,0 +1,92 @@
+/*
+ * $Id$
+ */
+
+/* Language Support Module */
+
+/* Language name: Chinese-GB */
+/* ISO language code (2 chars): ZH */
+/* Codepage: ???? */
+
+#include "hbdefs.h"
+
+char *hb_monthsname[ 12 ] =
+{
+   "一月",
+   "二月",
+   "三月",
+   "四月",
+   "五月",
+   "六月",
+   "七月",
+   "八月",
+   "九月",
+   "十月",
+   "十一月",
+   "十二月"
+};
+
+char *hb_daysname[ 7 ] =
+{
+   "星期日",
+   "星期一",
+   "星期二",
+   "星期三",
+   "星期四",
+   "星期五",
+   "星期六"
+};
+
+char *hb_errorsGeneric[] =
+{
+   "Unknown error",
+   "Argument error",
+   "Bound error",
+   "String overflow",
+   "Numeric overflow",
+   "Zero divisor",
+   "Numeric error",
+   "Syntax error",
+   "Operation too complex",
+   "",
+   "",
+   "Memory low",
+   "Undefined function",
+   "No exported method",
+   "Variable does not exist",
+   "Alias does not exist",
+   "No exported variable",
+   "Illegal characters in alias",
+   "Alias already in use",
+   "",
+   "Create error",
+   "Open error",
+   "Close error",
+   "Read error",
+   "Write error",
+   "Print error",
+   "",
+   "",
+   "",
+   "",
+   "Operation not supported",
+   "Limit exceeded",
+   "Corruption detected",
+   "Data type error",
+   "Data width error",
+   "Workarea not in use",
+   "Workarea not indexed",
+   "Exclusive required",
+   "Lock required",
+   "Write not allowed",
+   "Append lock failed",
+   "Lock Failure",
+   "",
+   "",
+   "",
+   "Incorrect number of arguments",
+   "array access",
+   "array assign",
+   "not an array",
+   "conditional"
+};