diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake
index f66ffac5b2..0ddfec8925 100644
--- a/ports/libxlsxwriter/portfile.cmake
+++ b/ports/libxlsxwriter/portfile.cmake
@@ -38,6 +38,13 @@ vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/xlsxwriter/third_party")
+
+set(public_third_party_files  # used by include/xlsxwriter/common.h
+    "${CURRENT_PACKAGES_DIR}/include/xlsxwriter/third_party/queue.h"
+    "${CURRENT_PACKAGES_DIR}/include/xlsxwriter/third_party/tree.h"
+)
+file(GLOB third_party_files "${CURRENT_PACKAGES_DIR}/include/xlsxwriter/third_party/*")
+list(REMOVE_ITEM third_party_files ${public_third_party_files})
+file(REMOVE_RECURSE ${third_party_files})
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")
diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json
index 78902547c8..29eb91813f 100644
--- a/ports/libxlsxwriter/vcpkg.json
+++ b/ports/libxlsxwriter/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "libxlsxwriter",
   "version": "1.2.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.",
   "homepage": "https://github.com/jmcnamara/libxlsxwriter",
   "documentation": "https://libxlsxwriter.github.io",
-  "license": "BSD-2-Clause",
+  "license": null,
   "dependencies": [
     "minizip",
     {
diff --git a/scripts/test_ports/vcpkg-ci-libxlsxwriter/portfile.cmake b/scripts/test_ports/vcpkg-ci-libxlsxwriter/portfile.cmake
new file mode 100644
index 0000000000..cbdc7d6869
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-libxlsxwriter/portfile.cmake
@@ -0,0 +1,7 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+vcpkg_find_acquire_program(PKGCONFIG)
+set(ENV{PKG_CONFIG} "${PKGCONFIG}")
+
+vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project")
+vcpkg_cmake_build()
diff --git a/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/CMakeLists.txt
new file mode 100644
index 0000000000..3d7f0fbf60
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.16)
+project(libxlsxwriter-test C)
+
+add_executable(main main.c)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libxlsxwriter xlsxwriter REQUIRED IMPORTED_TARGET)
+target_link_libraries(main PRIVATE PkgConfig::libxlsxwriter)
diff --git a/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/main.c b/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/main.c
new file mode 100644
index 0000000000..2f0ff8c93d
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-libxlsxwriter/project/main.c
@@ -0,0 +1,6 @@
+#include <xlsxwriter.h>
+
+int main() {
+    printf("libxlsxwriter version %s\n", lxw_version());
+    return 0;
+}
diff --git a/scripts/test_ports/vcpkg-ci-libxlsxwriter/vcpkg.json b/scripts/test_ports/vcpkg-ci-libxlsxwriter/vcpkg.json
new file mode 100644
index 0000000000..81a026575b
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-libxlsxwriter/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "vcpkg-ci-libxlsxwriter",
+  "version-string": "ci",
+  "description": "Validates libxlsxwriter",
+  "dependencies": [
+    "libxlsxwriter",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index b18da5a394..22419e9c14 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6062,7 +6062,7 @@
     },
     "libxlsxwriter": {
       "baseline": "1.2.4",
-      "port-version": 1
+      "port-version": 2
     },
     "libxml2": {
       "baseline": "2.15.3",
diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json
index cca29e5218..2eee1efb26 100644
--- a/versions/l-/libxlsxwriter.json
+++ b/versions/l-/libxlsxwriter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e33185b8ff2924cd731a8519f4c79e5ba8a4e5ce",
+      "version": "1.2.4",
+      "port-version": 2
+    },
     {
       "git-tree": "07519de687f98f868abf9a259d6ac96b6ec8880e",
       "version": "1.2.4",