diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 402a33f8d3f..64cedf590d6 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -1,4 +1,4 @@
-set (EX_VERSION 2.4.8)
+set(EX_VERSION 2.4.8)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -8,11 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(EXPAT_LINKAGE ON)
-else()
-    set(EXPAT_LINKAGE OFF)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/expat"
@@ -20,6 +16,7 @@ vcpkg_cmake_configure(
         -DEXPAT_BUILD_EXAMPLES=OFF
         -DEXPAT_BUILD_TESTS=OFF
         -DEXPAT_BUILD_TOOLS=OFF
+        -DEXPAT_BUILD_DOCS=OFF
         -DEXPAT_SHARED_LIBS=${EXPAT_LINKAGE}
         -DEXPAT_BUILD_PKGCONFIG=ON
 )
@@ -31,9 +28,10 @@ vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/expat_external.h
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/expat_external.h"
         "! defined(XML_STATIC)"
         "/* vcpkg static build ! defined(XML_STATIC) */ 0"
     )
@@ -41,7 +39,5 @@ endif()
 
 vcpkg_copy_pdbs()
 
-#Handle copyright
-file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/expat/vcpkg-cmake-wrapper.cmake b/ports/expat/vcpkg-cmake-wrapper.cmake
index 4d3e9e05d9c..2bdace20c71 100644
--- a/ports/expat/vcpkg-cmake-wrapper.cmake
+++ b/ports/expat/vcpkg-cmake-wrapper.cmake
@@ -24,4 +24,4 @@ if(EXPAT_FOUND AND TARGET EXPAT::EXPAT)
 endif()
 
 unset(EXPATNAMES)
-unset(DEBUGNAMES)
\ No newline at end of file
+unset(DEBUGNAMES)
diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json
index 909693ed000..c56815d5044 100644
--- a/ports/expat/vcpkg.json
+++ b/ports/expat/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "expat",
   "version": "2.4.8",
+  "port-version": 1,
   "description": "XML parser library written in C",
   "homepage": "https://github.com/libexpat/libexpat",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9a934564a4d..0bf2ca3bcdf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2102,7 +2102,7 @@
     },
     "expat": {
       "baseline": "2.4.8",
-      "port-version": 0
+      "port-version": 1
     },
     "expected-lite": {
       "baseline": "0.5.0",
diff --git a/versions/e-/expat.json b/versions/e-/expat.json
index 6e98367de2c..812a56a8324 100644
--- a/versions/e-/expat.json
+++ b/versions/e-/expat.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18754c99766e364a887a08bbf85c7fae06185f36",
+      "version": "2.4.8",
+      "port-version": 1
+    },
     {
       "git-tree": "35013cd612175defc1832114f6a841888a6f6aad",
       "version": "2.4.8",