diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake
index 08584fe5cf5b85..a2a06b1aa8c517 100644
--- a/ports/xbyak/portfile.cmake
+++ b/ports/xbyak/portfile.cmake
@@ -1,14 +1,25 @@
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO herumi/xbyak
-    REF v5.97
-    SHA512 813d5363063b9bd8f3645652826cbbf9c0fdfc7775974bd257b9635ce7d1edbd6a7099216a8e7ec6252cb6e56aa4b6c6f9b0fd84b5748fa79c04abb799731cde
+    REF 77ffe717376d194f1e5cc910bbd755d99bbba94e	# 5.991 + cmake targets
+    SHA512 4e1ffa98dc63444aebf0a6e7a4ea57a9040cbf261f3a6fa43d23f0361cece71f1f4b597e95b6c85efbd4668e421081730b04ee924450ea0b0114923c36fc9c74
     HEAD_REF master
 )
 
-# handle license file
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
 
-# copy headers
-file(GLOB HEADER_FILES ${SOURCE_PATH}/xbyak/*.h)
-file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xbyak)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json
index 7c42b5c168e168..3f18d44c5c6abf 100644
--- a/ports/xbyak/vcpkg.json
+++ b/ports/xbyak/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "xbyak",
-  "version-string": "5.97",
+  "version-string": "5.991",
   "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).",
   "homepage": "https://github.com/herumi/xbyak",
   "supports": "!(arm | uwp)"