diff --git a/ports/libx11/portfile.cmake b/ports/libx11/portfile.cmake
index 52449bbe530993..51a5c24d8e808d 100644
--- a/ports/libx11/portfile.cmake
+++ b/ports/libx11/portfile.cmake
@@ -61,6 +61,13 @@ vcpkg_configure_make(
         ${OPTIONS}
 )
 
+if(VCPKG_CROSSCOMPILING)
+    file(GLOB FOR_BUILD_FILES "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/*")
+    file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/util")
+    endif()
+endif()
 vcpkg_install_make()
 vcpkg_fixup_pkgconfig()
 
@@ -73,8 +80,17 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+if(NOT VCPKG_CROSSCOMPILING)
+    file(READ "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" config_contents)
+    string(REGEX MATCH "ac_cv_objext=[^\n]+" objsuffix "${config_contents}")
+    string(REPLACE "ac_cv_objext=" "." objsuffix "${objsuffix}")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${objsuffix}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
 endif()
 
+endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
-    "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY)
\ No newline at end of file
+    "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY)
+
diff --git a/ports/libx11/vcpkg.json b/ports/libx11/vcpkg.json
index 4f68d076b46e20..f48ef72d817c03 100644
--- a/ports/libx11/vcpkg.json
+++ b/ports/libx11/vcpkg.json
@@ -1,11 +1,16 @@
 {
   "name": "libx11",
   "version": "1.7.3.1",
+  "port-version": 1,
   "description": "The X Window System is a network-transparent window system that was designed at MIT.",
   "homepage": "https://www.x.org/wiki/",
   "license": "MIT",
   "dependencies": [
     "bzip2",
+    {
+      "name": "libx11",
+      "host": true
+    },
     {
       "name": "libxslt",
       "host": true
diff --git a/ports/libxdamage/portfile.cmake b/ports/libxdamage/portfile.cmake
new file mode 100644
index 00000000000000..44ed2a42e19e92
--- /dev/null
+++ b/ports/libxdamage/portfile.cmake
@@ -0,0 +1,30 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxdamage
+    REF 977b04cd69738806e0b48fcf5c725763d065f06d # 1.1.5
+    SHA512  79c3a4c63f6c50c39d324183b98ad7e70235aed1c8385acf2f593739c71e7929119448be3e15dffd276b32e4fbb056508deeb35f450f74b85c101047f68d4339
+    HEAD_REF master # branch name
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
diff --git a/ports/libxdamage/vcpkg.json b/ports/libxdamage/vcpkg.json
new file mode 100644
index 00000000000000..dc86f1ee794536
--- /dev/null
+++ b/ports/libxdamage/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "libxdamage",
+  "version": "1.1.5",
+  "description": "X Damage Extension library",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxdamage",
+  "license": null,
+  "dependencies": [
+    "bzip2",
+    "libx11",
+    "libxfixes",
+    "xorg-macros",
+    "xproto"
+  ]
+}
diff --git a/ports/libxext/portfile.cmake b/ports/libxext/portfile.cmake
new file mode 100644
index 00000000000000..a116f6fd0de816
--- /dev/null
+++ b/ports/libxext/portfile.cmake
@@ -0,0 +1,31 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxext
+    REF ebb167f34a3514783966775fb12573c4ed209625 # 1.3.4
+    SHA512  509cb67ad9dba37adbcc49dca6e9803b318f62e8e2b981ccf73ce328a8104e94615312c5914b480ba04e28d208cd93d8a71b3e6e2ef1a4e5615aa2a3f9ba19e7
+    HEAD_REF master
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+    OPTIONS xorg_cv_malloc0_returns_null=yes
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
diff --git a/ports/libxext/vcpkg.json b/ports/libxext/vcpkg.json
new file mode 100644
index 00000000000000..ed49330c742ad8
--- /dev/null
+++ b/ports/libxext/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "libxext",
+  "version": "1.3.4",
+  "description": "Xlib-based library for common extensions to the X11 protocol",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxext",
+  "license": null,
+  "dependencies": [
+    "libx11",
+    "xorg-macros",
+    "xproto"
+  ]
+}
diff --git a/ports/libxfixes/portfile.cmake b/ports/libxfixes/portfile.cmake
new file mode 100644
index 00000000000000..0441be999c4099
--- /dev/null
+++ b/ports/libxfixes/portfile.cmake
@@ -0,0 +1,29 @@
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+else()
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org/xorg
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lib/libxfixes
+    REF 6fe3bd64dd82f704ed91478acb4c99ab5c00be16 # 6.0.0
+    SHA512  429e65f4183d92cee1380273a23be9bf157bdd19e01e164d8b9058a2a54601af8f4556888302a2cad062c2cfc4b3a37d6b8f5b7ac6bdd6b5c069c7b791422201
+    HEAD_REF master
+) 
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+endif()
diff --git a/ports/libxfixes/vcpkg.json b/ports/libxfixes/vcpkg.json
new file mode 100644
index 00000000000000..a079b2264dd155
--- /dev/null
+++ b/ports/libxfixes/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "libxfixes",
+  "version": "6.0.0",
+  "description": "Xlib-based library for the XFIXES Extension",
+  "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfixes",
+  "license": null,
+  "dependencies": [
+    "libx11",
+    "xorg-macros",
+    "xproto"
+  ]
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index dfbf59cf95061c..02e983e88e0d99 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1194,8 +1194,6 @@ xalan-c:x64-windows-static=fail
 xalan-c:arm64-windows=fail
 xerces-c:arm-uwp=fail
 xerces-c:x64-uwp=fail
-# Crosscompiling libx11 requires additional steps and patches to the Makefiles. 
-libx11:arm64-windows=fail
 xmlsec:arm-uwp=fail
 xmlsec:x64-uwp=fail
 yara:arm-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index ec88fb92c9f04f..c05432f9d8d5b7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4266,12 +4266,16 @@
     },
     "libx11": {
       "baseline": "1.7.3.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libxau": {
       "baseline": "1.0.9",
       "port-version": 0
     },
+    "libxdamage": {
+      "baseline": "1.1.5",
+      "port-version": 0
+    },
     "libxdiff": {
       "baseline": "0.23",
       "port-version": 2
@@ -4280,6 +4284,14 @@
       "baseline": "1.1.3",
       "port-version": 0
     },
+    "libxext": {
+      "baseline": "1.3.4",
+      "port-version": 0
+    },
+    "libxfixes": {
+      "baseline": "6.0.0",
+      "port-version": 0
+    },
     "libxlsxwriter": {
       "baseline": "1.1.4",
       "port-version": 0
diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json
index fe64a753250d6b..9e71dbb6c76c36 100644
--- a/versions/l-/libx11.json
+++ b/versions/l-/libx11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e69bacce69d31cc63b4c1f6c5637ba204289a496",
+      "version": "1.7.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "1347521fb39c2ccfd11521a3e641854537799ca4",
       "version": "1.7.3.1",
diff --git a/versions/l-/libxdamage.json b/versions/l-/libxdamage.json
new file mode 100644
index 00000000000000..2c9916b6e75ba0
--- /dev/null
+++ b/versions/l-/libxdamage.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "87138386fc68780b661be1216e8bb2e334071702",
+      "version": "1.1.5",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/l-/libxext.json b/versions/l-/libxext.json
new file mode 100644
index 00000000000000..5ffa055aed3e06
--- /dev/null
+++ b/versions/l-/libxext.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e67774822086eb3d56334159f5aad5579643b5d3",
+      "version": "1.3.4",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/l-/libxfixes.json b/versions/l-/libxfixes.json
new file mode 100644
index 00000000000000..538847ac65febc
--- /dev/null
+++ b/versions/l-/libxfixes.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "1f0262e8d5145c540a26a4740b62c84794244586",
+      "version": "6.0.0",
+      "port-version": 0
+    }
+  ]
+}