diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index a30996649..67c4bef2a 100755
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -642,7 +642,15 @@ if(CMAKE_RC_COMPILER)
     list(GET VERSION_LIST 1 X265_VERSION_MINOR)
     set(X265_BRANCH_ID 0) # TODO: 0 - stable, 1 - default or other
     set(X265_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/x265.rc")
+    set(X265LIB_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/libx265.rc")
+    set(X265_RC_MANIFEST "${CMAKE_CURRENT_BINARY_DIR}/x265res.manifest")
+    set(X265_FNAME "265.exe")
+    set(CLI_MANIFEST "\n1 RT_MANIFEST \"x265res.manifest\"\n")
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/x265.rc.in" "${X265_RC_FILE}" @ONLY)
+    set(X265_FNAME "libx265.dll")
+    set(CLI_MANIFEST "")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/x265.rc.in" "${X265LIB_RC_FILE}" @ONLY)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/x265res.manifest.in" "${X265_RC_MANIFEST}" @ONLY)
 endif()
 
 if(NOT (MSVC_IDE OR XCODE))
@@ -652,7 +660,7 @@ option(ENABLE_SHARED "Build shared library" ON)
 if(ENABLE_SHARED)
     if(ENABLE_HDR10_PLUS)
         add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${ASM_OBJS}
-                    ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10>)
+                    ${X265LIB_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> $<TARGET_OBJECTS:dynamicHDR10>)
         add_library(hdr10plus-shared SHARED $<TARGET_OBJECTS:dynamicHDR10>)
 
         if(MSVC)
@@ -662,7 +670,7 @@ if(ENABLE_SHARED)
         endif()
     else()
         add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${ASM_OBJS}
-                   ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
+                   ${X265LIB_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
     endif()
     if(EXTRA_LIB)
         target_link_libraries(x265-shared ${EXTRA_LIB})
diff --git a/source/x265.rc.in b/source/x265.rc.in
index c737d94cd..3e291c511 100644
--- a/source/x265.rc.in
+++ b/source/x265.rc.in
@@ -1,5 +1,5 @@
 #include <winresrc.h>
-
+@CLI_MANIFEST@
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION    @X265_VERSION_MAJOR@,@X265_VERSION_MINOR@,@X265_BRANCH_ID@,@X265_TAG_DISTANCE@
   PRODUCTVERSION @X265_VERSION_MAJOR@,@X265_VERSION_MINOR@,@X265_BRANCH_ID@,@X265_TAG_DISTANCE@
@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "FileVersion",      "@X265_VERSION@"
         VALUE "InternalName",     "x265"
         VALUE "LegalCopyright",   "Multicoreware: GPLv2 or commercial"
-        VALUE "OriginalFilename", "libx265.dll"
+        VALUE "OriginalFilename", "@X265_FNAME@"
         VALUE "ProductName",      "x265"
         VALUE "ProductVersion",   "@X265_VERSION@"
       END
diff --git a/source/x265res.manifest.in b/source/x265res.manifest.in
new file mode 100644
index 000000000..2ae61a00e
--- /dev/null
+++ b/source/x265res.manifest.in
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity type="win32" name="MCW.x265-aMod" version="@X265_VERSION_MAJOR@.@X265_VERSION_MINOR@.@X265_BRANCH_ID@.@X265_TAG_DISTANCE@"/>
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+            <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+        </windowsSettings>
+    </application>
+</assembly>