diff --git a/ChangeLog.txt b/ChangeLog.txt
index ba02bc670d..123475ab11 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,19 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2020-02-10 15:34 UTC+0100 Aleksander Czajczynski (hb fki.pl)
+  + src/codepage/cpde858.c
+  * src/codepage/Makefile
+  * include/hbcpage.hbx
+  * src/harbour.def
+    + added codepage DE858, it is essentially DE850 but with EURO SIGN
+      (U+20AC) at position 0xD5 instead of Turkish dotless-i (U+0131)
+      Issue #201
+
+  * src/vm/fm.c
+    * OpenWatcom remaining pragmas related to 201 warning (unreachable code)
+      assigned to C mode (wcc386) build only - issue #202
+
 2020-02-05 11:25 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * src/vm/fm.c
   * src/macro/macro.y
diff --git a/include/hbcpage.hbx b/include/hbcpage.hbx
index a11249248a..f6c3e264ed 100644
--- a/include/hbcpage.hbx
+++ b/include/hbcpage.hbx
@@ -38,6 +38,7 @@ DYNAMIC HB_CODEPAGE_CSKAMC
 DYNAMIC HB_CODEPAGE_CSWIN
 DYNAMIC HB_CODEPAGE_DE850
 DYNAMIC HB_CODEPAGE_DE850M
+DYNAMIC HB_CODEPAGE_DE858
 DYNAMIC HB_CODEPAGE_DEISO
 DYNAMIC HB_CODEPAGE_DEWIN
 DYNAMIC HB_CODEPAGE_DK865
diff --git a/src/codepage/Makefile b/src/codepage/Makefile
index 932a7016db..373ef55d1a 100644
--- a/src/codepage/Makefile
+++ b/src/codepage/Makefile
@@ -17,6 +17,7 @@ C_SOURCES := \
    cpcswin.c \
    cpde850.c \
    cpde850m.c \
+   cpde858.c \
    cpdeiso.c \
    cpdewin.c \
    cpdk865.c \
diff --git a/src/codepage/cpde858.c b/src/codepage/cpde858.c
new file mode 100644
index 0000000000..ea8cbfaf78
--- /dev/null
+++ b/src/codepage/cpde858.c
@@ -0,0 +1,17 @@
+/*
+ * National Collation Support Module (DE858)
+ *
+ * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
+ * Copyright 2020 Aleksander Czajczynski <hb fki.pl>
+ *
+ */
+
+#define HB_CP_ID        DE858
+#define HB_CP_INFO      "German CP-858"
+#define HB_CP_UNITB     HB_UNITB_858
+#define HB_CP_ACSORT    HB_CDP_ACSORT_NONE
+#include "l_de.h"
+#define HB_CP_UTF8
+
+/* include CP registration code */
+#include "hbcdpreg.h"
diff --git a/src/harbour.def b/src/harbour.def
index 21c6153b1a..647f996c27 100644
--- a/src/harbour.def
+++ b/src/harbour.def
@@ -349,6 +349,7 @@ HB_FUN_HB_CODEPAGE_CSKAMC
 HB_FUN_HB_CODEPAGE_CSWIN
 HB_FUN_HB_CODEPAGE_DE850
 HB_FUN_HB_CODEPAGE_DE850M
+HB_FUN_HB_CODEPAGE_DE858
 HB_FUN_HB_CODEPAGE_DEISO
 HB_FUN_HB_CODEPAGE_DEWIN
 HB_FUN_HB_CODEPAGE_DK865
diff --git a/src/vm/fm.c b/src/vm/fm.c
index 243b54392e..eeaca9cbfc 100644
--- a/src/vm/fm.c
+++ b/src/vm/fm.c
@@ -169,8 +169,9 @@
 #        pragma warning 367 9
 #        pragma warning 368 9
 #        pragma warning 887 9
+#     else
+#        pragma disable_message ( 201 )
 #     endif
-#     pragma disable_message ( 201 )
 #     if ! defined( USE_DL_PREFIX ) && ! defined( HB_FM_DLMT_ALLOC )
 #        define USE_DL_PREFIX
 #     endif
@@ -218,8 +219,9 @@
 #        pragma warning 367 2
 #        pragma warning 368 2
 #        pragma warning 887 2
+#     else
+#        pragma enable_message ( 201 )
 #     endif
-#     pragma enable_message ( 201 )
 #  elif defined( _MSC_VER )
 #     pragma warning( pop )
 #  endif