diff --git a/ChangeLog.txt b/ChangeLog.txt
index fc6306a45f..38ac334dd6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,22 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2020-02-05 08:08 UTC+0100 Aleksander Czajczynski (hb fki.pl)
+  * config/dos/watcom.mk
+  * config/linux/watcom.mk
+  * config/os2/watcom.mk
+  * config/win/watcom.mk
+  * src/compiler/harbour.y
+  * src/compiler/harbour.yyc
+  * utils/hbmk2/hbmk2.prg
+    ! fix OpenWatcom disabled warning listings, numeric specifiers have
+      different meanings in C (wcc386) and C++ mode (wpp386) compiler
+      executables. "-wcd201" - not fully sure about it, is now assigned
+      to C mode: "unreachable code". References issue #202.
+
+  * ChangeLog.txt
+    ! fix UTF-8 char broken by Maurizio
+
 2020-02-04 21:12 UTC+0100 Maurizio la Cecilia (m.lacecilia/at/gmail.com)
   * contrib/hbformat/hbfmtcls.prg
     ! fixed wrong spacing between comment indicators
@@ -3905,7 +3921,7 @@
 
 2016-01-24 13:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rdd/delim1.c
-    ! added missing casting - it fixes problem reported by Franĝek Prijatelj
+    ! added missing casting - it fixes problem reported by Franček Prijatelj
 
 2016-01-23 13:59 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbformat/hbfmtcls.prg
@@ -6321,7 +6337,7 @@
 2015-04-01 14:59 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/debug/dbgentry.c
     ! fixed typo in my previous commit for AltD() function detection
-      Thanks to Franĝek Prijatelj for reporting the problem and Abe
+      Thanks to Franček Prijatelj for reporting the problem and Abe
       for self contain example
 
   * src/rdd/dbfcdx/dbfcdx1.c
@@ -9781,7 +9797,7 @@
 
 2014-03-04 19:12 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/xhb/hbserv.c
-    * pacified CLANG warning reported by Franĝek
+    * pacified CLANG warning reported by Franček
 
 2014-03-04 18:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/debug/debugger.prg
@@ -10859,11 +10875,11 @@
 
 2013-11-28 03:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbmxml/3rd/minixml/mxml_fil.c
-    ! fixed mxmlLoadString() with top node - patch by Franĝek Prijatelj
+    ! fixed mxmlLoadString() with top node - patch by Franček Prijatelj
 
   * contrib/hbmxml/core.c
     ! fixed mxml node reference counter in mxmlAdd() - it fixes 2nd
-      problem reported by Franĝek Prijatelj
+      problem reported by Franček Prijatelj
 
 2013-11-27 20:32 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rtl/gtxwc/gtxwc.c
@@ -11505,7 +11521,7 @@
   * src/debug/debugger.prg
     ! keep RunAtStartup flag synced with menu
     ! fixed options decoding from init.cld file.
-      Thanks to Franĝek Prijatelj for locating the problem though fix
+      Thanks to Franček Prijatelj for locating the problem though fix
       should be a little bit different.
 
   * src/debug/tbrwtext.prg
@@ -47056,7 +47072,7 @@
 2011-06-03 13:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idebrowse.prg
     % Set vertical scrollbars of XbpBrowse() class to honor thumb
-      positioning per open index. Pointed out by Franĝek.
+      positioning per open index. Pointed out by Franček.
 
 2011-06-03 13:11 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/hbqtgui.hbx
@@ -91470,7 +91486,7 @@
 
 2010-02-23 08:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbslots.cpp
-    ! Applied patch provided by Franĝek.
+    ! Applied patch provided by Franček.
       This removes the 128 nesting loop limit in MSVC.
 
   * contrib/hbide/ideharbourhelp.prg
diff --git a/config/dos/watcom.mk b/config/dos/watcom.mk
index 253b8dbbee..1ce5ed7477 100644
--- a/config/dos/watcom.mk
+++ b/config/dos/watcom.mk
@@ -17,9 +17,11 @@ LDFLAGS += OP quiet
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
 else
-   CFLAGS += -w1 -wcd201 -wcd367 -wcd368
-   ifneq ($(HB_BUILD_MODE),cpp)
-      CFLAGS += -wcd124 -wcd136
+   CFLAGS += -w1
+   ifeq ($(HB_BUILD_MODE),cpp)
+      CFLAGS += -wcd367 -wcd368
+   else
+      CFLAGS += -wcd124 -wcd136 -wcd201
    endif
 endif
 
diff --git a/config/linux/watcom.mk b/config/linux/watcom.mk
index 0040978b6f..7109cf4380 100644
--- a/config/linux/watcom.mk
+++ b/config/linux/watcom.mk
@@ -16,9 +16,11 @@ LDFLAGS += OP quiet
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
 else
-   CFLAGS += -w1 -wcd201 -wcd367 -wcd368
-   ifneq ($(HB_BUILD_MODE),cpp)
-      CFLAGS += -wcd124 -wcd136
+   CFLAGS += -w1
+   ifeq ($(HB_BUILD_MODE),cpp)
+      CFLAGS += -wcd367 -wcd368
+   else
+      CFLAGS += -wcd124 -wcd136 -wcd201
    endif
 endif
 
diff --git a/config/os2/watcom.mk b/config/os2/watcom.mk
index bfcb51bd13..b1af0b2e07 100644
--- a/config/os2/watcom.mk
+++ b/config/os2/watcom.mk
@@ -18,9 +18,11 @@ LDFLAGS += OP quiet
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
 else
-   CFLAGS += -w1 -wcd201 -wcd367 -wcd368
-   ifneq ($(HB_BUILD_MODE),cpp)
-      CFLAGS += -wcd124 -wcd136
+   CFLAGS += -w1
+   ifeq ($(HB_BUILD_MODE),cpp)
+      CFLAGS += -wcd367 -wcd368
+   else
+      CFLAGS += -wcd124 -wcd136 -wcd201
    endif
 endif
 
diff --git a/config/win/watcom.mk b/config/win/watcom.mk
index 670d0d9603..e78aef5503 100644
--- a/config/win/watcom.mk
+++ b/config/win/watcom.mk
@@ -18,9 +18,11 @@ LDFLAGS += OP quiet
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
 else
-   CFLAGS += -w1 -wcd201 -wcd367 -wcd368
-   ifneq ($(HB_BUILD_MODE),cpp)
-      CFLAGS += -wcd124 -wcd136
+   CFLAGS += -w1
+   ifeq ($(HB_BUILD_MODE),cpp)
+      CFLAGS += -wcd367 -wcd368
+   else
+      CFLAGS += -wcd124 -wcd136 -wcd201
    endif
 endif
 
diff --git a/src/compiler/harbour.y b/src/compiler/harbour.y
index f57c0d4c10..3b6600725b 100644
--- a/src/compiler/harbour.y
+++ b/src/compiler/harbour.y
@@ -43,7 +43,7 @@
 #  pragma warn -aus
 #  pragma warn -ccc
 #  pragma warn -rch
-#elif defined( __WATCOMC__ )
+#elif defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 13 9
 #  pragma warning 368 9
 #elif defined( _MSC_VER )
diff --git a/src/compiler/harbour.yyc b/src/compiler/harbour.yyc
index 9ba35fa9c4..2a9b8cf884 100644
--- a/src/compiler/harbour.yyc
+++ b/src/compiler/harbour.yyc
@@ -110,7 +110,7 @@
 #  pragma warn -aus
 #  pragma warn -ccc
 #  pragma warn -rch
-#elif defined( __WATCOMC__ )
+#elif defined( __WATCOMC__ ) && defined( __cplusplus )
 #  pragma warning 13 9
 #  pragma warning 368 9
 #elif defined( _MSC_VER )
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 22ec6b844f..274d541aeb 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -4800,9 +4800,13 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
          CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-wx" ) ; EXIT
          CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w3" ) ; EXIT
          CASE _WARN_LOW
-            AAdd( hbmk[ _HBMK_aOPTC ], "-w1 -wcd201 -wcd367 -wcd368" )
-            IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ]
-               AAdd( hbmk[ _HBMK_aOPTC ], "-wcd124 -wcd136" )
+            AAdd( hbmk[ _HBMK_aOPTC ], "-w1" )
+            IF hbmk[ _HBMK_lCPP ] != NIL
+               IF hbmk[ _HBMK_lCPP ]
+                  AAdd( hbmk[ _HBMK_aOPTC ], "-wcd124 -wcd136 -wcd201" )
+               ELSE
+                  AAdd( hbmk[ _HBMK_aOPTC ], "-wcd367 -wcd368" )
+               ENDIF
             ENDIF
             EXIT
          CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-w0" ) ; EXIT