diff --git a/ChangeLog.txt b/ChangeLog.txt
index a4d792d963..319d34a3cb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,21 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2018-02-11 12:55 UTC+0100 Aleksander Czajczynski (hb fki.pl)
+  * package/harbour.mft
+    + added version manifest to Harbour compiler binaries, which is more
+      important on Windows 10 builds, to not include false Windows version
+      in build info.
+      This doesn't affect programs built with Harbour, where similar manifest
+      should be included or not, according to your needs.
+
+  * utils/hbmk2/hbmk2.prg
+    * define _UNICODE (activates unicode C RTL functions in OpenWatcom
+      and some MS C compilers) together with UNICODE in -winuni mode.
+      Similar change was done in Viktor's forked Harbour 3.4. Harbour
+      core/contrib code doesn't use any of these C RTL, but in most 3rd
+      party code it's expected that these are enabled both.
+
 2018-02-11 12:15 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * contrib/hbdoc/hbdoc.prg
   * contrib/hbformat/utils/hbformat.prg
diff --git a/package/harbour.mft b/package/harbour.mft
index 904afcd6aa..67a1e2aef8 100644
--- a/package/harbour.mft
+++ b/package/harbour.mft
@@ -16,4 +16,18 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Vista / Server 2008 -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- 7 / Server 2008 R2 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- 8 / Server 2012 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- 8.1 / Server 2012 R2 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- 10 / Server 2016 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
 </assembly>
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index bd59d81819..f0c69c8fa2 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -4493,6 +4493,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
          ENDIF
          IF hbmk[ _HBMK_lWINUNI ]
             AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
+            AAdd( hbmk[ _HBMK_aOPTC ], "-D_UNICODE" )
          ENDIF
          IF hbmk[ _HBMK_cPLAT ] == "wce"
             AAdd( l_aLIBSYS, "mmtimer" )