diff --git a/ports/node-addon-api/portfile.cmake b/ports/node-addon-api/portfile.cmake
index d70301a1be..28ad8e2553 100644
--- a/ports/node-addon-api/portfile.cmake
+++ b/ports/node-addon-api/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO nodejs/node-addon-api
   REF "v${VERSION}"
-  SHA512 ff7b712b53479c10ebf34b6723b91a3e70eb946c39fc7feeebc5485a3928f15ce2af92126d3c331e54fbb852bec8286aa5ddd8211f1315f3b133fcede6e2f53c
+  SHA512 15e365f284c921e3d0464be645addae0b92b4500d4e58e4fd8a5b10aa7a79a49c9f4231bd61fb0982c2df3eb9d495d91e9961108bc92911413f0cffbec93d3a2
   HEAD_REF main
 )
 
diff --git a/ports/node-addon-api/vcpkg.json b/ports/node-addon-api/vcpkg.json
index 74a31d37a8..bde571de6a 100644
--- a/ports/node-addon-api/vcpkg.json
+++ b/ports/node-addon-api/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "node-addon-api",
-  "version": "7.0.0",
+  "version": "8.3.1",
   "description": "Module for using Node-API from C++",
   "homepage": "https://github.com/nodejs/node-addon-api",
   "license": "MIT",
diff --git a/ports/node-api-headers/CMakeLists.txt b/ports/node-api-headers/CMakeLists.txt
index 8360555407..cf8a3f684e 100644
--- a/ports/node-api-headers/CMakeLists.txt
+++ b/ports/node-api-headers/CMakeLists.txt
@@ -1,5 +1,19 @@
 project(nodelib C)
 
+if (MINGW)
+add_custom_target(nodelib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libnode.a)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libnode.a
+  COMMAND ${CMAKE_DLLTOOL}
+          -d "${CMAKE_CURRENT_SOURCE_DIR}/def/node_api.def"
+          -l "${CMAKE_CURRENT_BINARY_DIR}/libnode.a"
+          ${CMAKE_MODULE_LINKER_FLAGS}
+          $<$<CONFIG:Debug>:${CMAKE_MODULE_LINKER_FLAGS_DEBUG}>
+          $<$<CONFIG:Release>:${CMAKE_MODULE_LINKER_FLAGS_RELEASE}>
+  COMMENT "Building import library for NodeJS"
+)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnode.a DESTINATION lib)
+else()
 add_custom_target(nodelib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node.lib)
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/node.lib
@@ -11,5 +25,5 @@ add_custom_command(
           $<$<CONFIG:Release>:${CMAKE_STATIC_LINKER_FLAGS_RELEASE}>
   COMMENT "Building import library for NodeJS"
 )
-
-install(FILES ${CMAKE_BINARY_DIR}/node.lib DESTINATION lib)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/node.lib DESTINATION lib)
+endif()
diff --git a/ports/node-api-headers/portfile.cmake b/ports/node-api-headers/portfile.cmake
index 0d01ee222a..ae4e32ad28 100644
--- a/ports/node-api-headers/portfile.cmake
+++ b/ports/node-api-headers/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO nodejs/node-api-headers
   REF "v${VERSION}"
-  SHA512 70871b8fd1fc16f3f525953fd229ceff99110fb604f039e35e44f21d74aa9d50d2d3be1eadc5700bf576fd27e750c71868b273277858195fb6c5739672d4455e
+  SHA512 af4d4672193f16b81984b6fea19bfdd72d3af343f417339afa6484b078b799d1aa21c91e7d2ca0dd677000b22750f4d14c6a6ebdf06981dd7655558f8aa743a3
   HEAD_REF main
 )
 
diff --git a/ports/node-api-headers/vcpkg.json b/ports/node-api-headers/vcpkg.json
index fb54df90e0..524af72642 100644
--- a/ports/node-api-headers/vcpkg.json
+++ b/ports/node-api-headers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "node-api-headers",
-  "version": "1.1.0",
+  "version": "1.5.0",
   "description": "NodeJS API for writing modules in C++",
   "homepage": "https://nodejs.org/api/addons.html",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 467906a760..9b20e540c3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6561,11 +6561,11 @@
       "port-version": 3
     },
     "node-addon-api": {
-      "baseline": "7.0.0",
+      "baseline": "8.3.1",
       "port-version": 0
     },
     "node-api-headers": {
-      "baseline": "1.1.0",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "nodesoup": {
diff --git a/versions/n-/node-addon-api.json b/versions/n-/node-addon-api.json
index 0799639748..db7264c383 100644
--- a/versions/n-/node-addon-api.json
+++ b/versions/n-/node-addon-api.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f13525d26ba3b67d939e73bf9fc9238c970e5cef",
+      "version": "8.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "81fa7773a3a022325f43fa266ce809c1bb3ceffd",
       "version": "7.0.0",
diff --git a/versions/n-/node-api-headers.json b/versions/n-/node-api-headers.json
index 2fc654d287..85d2226c39 100644
--- a/versions/n-/node-api-headers.json
+++ b/versions/n-/node-api-headers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0dd99f007a3d9873fda33d17b0dd824b924adb7d",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "913a99892edcb72bcc2a479471caf0f9edb35311",
       "version": "1.1.0",