diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake
index 2bcd0ecc12..ee3514eab4 100644
--- a/ports/directx-headers/portfile.cmake
+++ b/ports/directx-headers/portfile.cmake
@@ -1,21 +1,21 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Microsoft/DirectX-Headers
-    REF v${VERSION}
-    SHA512 3c907ca4aa34dd6775321bc71267c041ab87a1d981c09ca53f8974891f4b47d01e35fefd164280da7ad7497e1c827d8bed4797ca1015c44a8aa563fa38055ec0
-    HEAD_REF main
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DDXHEADERS_INSTALL=ON -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_fixup_pkgconfig()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectX-Headers
+    REF v${VERSION}
+    SHA512 21bf2d6e4fdcaa331afb6de20c87ebec59b5bad36c155655acd725fde46faedd4cf1503646857b2a5d02f50fbacd8c55de91a79b2a616b05535704de4fbe777e
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS -DDXHEADERS_INSTALL=ON -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/directx-headers/usage b/ports/directx-headers/usage
index bc8737563e..eef2ab7f0a 100644
--- a/ports/directx-headers/usage
+++ b/ports/directx-headers/usage
@@ -1,4 +1,4 @@
-The DirectX Headers package provides CMake targets:
-
-    find_package(directx-headers CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE Microsoft::DirectX-Headers)
+The DirectX Headers package provides CMake targets:
+
+    find_package(directx-headers CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectX-Headers)
diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json
index c3da2da2df..8a349a326b 100644
--- a/ports/directx-headers/vcpkg.json
+++ b/ports/directx-headers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "directx-headers",
-  "version": "1.619.1",
+  "version": "1.619.4",
   "description": "Official DirectX 12 Headers",
   "homepage": "https://devblogs.microsoft.com/directx/",
   "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/",
diff --git a/ports/directx12-agility/portfile.cmake b/ports/directx12-agility/portfile.cmake
index 9deba5be91..21bf187bdf 100644
--- a/ports/directx12-agility/portfile.cmake
+++ b/ports/directx12-agility/portfile.cmake
@@ -1,47 +1,47 @@
-set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
-set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # headers are provided by the directx-headers port
-set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
-set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # DX12 SDK Debug Layer is an extra DLL
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/${VERSION}"
-    FILENAME "Microsoft.Direct3D.D3D12.${VERSION}.zip"
-    SHA512 8d8525e95369e364120762b91d1f6d3770bab78135cff3dd958309c8bb9a19bdf141570d9d9e50a36f6de6cc6e7be30a7e39cf0af78ac41ea3134b41ddb0683e
-)
-
-vcpkg_extract_source_archive(
-    PACKAGE_PATH
-    ARCHIVE ${ARCHIVE}
-    NO_REMOVE_ONE_LEVEL
-)
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(REDIST_ARCH arm64)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(REDIST_ARCH win32)
-else()
-    set(REDIST_ARCH x64)
-endif()
-
-file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-
-file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.pdb"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-
-file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.exe" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.pdb"
-        DESTINATION "${CURRENT_PACKAGES_DIR}/tools//${PORT}")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt")
-
-message(STATUS "BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS: https://www.nuget.org/packages/Microsoft.Direct3D.D3D12/${VERSION}/License")
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/directx12-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
+set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # headers are provided by the directx-headers port
+set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # DX12 SDK Debug Layer is an extra DLL
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/${VERSION}"
+    FILENAME "Microsoft.Direct3D.D3D12.${VERSION}.zip"
+    SHA512 6a275381027ed758714eedf1ccaeea446b1d9afeddc1f6b6bbc3c85939ef9ffd02b7fae780cd50da635b66b09f5fce99535788551cd64e3663b9e59fe6f7d9de
+)
+
+vcpkg_extract_source_archive(
+    PACKAGE_PATH
+    ARCHIVE ${ARCHIVE}
+    NO_REMOVE_ONE_LEVEL
+)
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(REDIST_ARCH arm64)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(REDIST_ARCH win32)
+else()
+    set(REDIST_ARCH x64)
+endif()
+
+file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+
+file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.pdb"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.exe" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.pdb"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/tools//${PORT}")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt")
+
+message(STATUS "BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS: https://www.nuget.org/packages/Microsoft.Direct3D.D3D12/${VERSION}/License")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/directx12-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
diff --git a/ports/directx12-agility/usage b/ports/directx12-agility/usage
index 4ba0348639..fe251b111c 100644
--- a/ports/directx12-agility/usage
+++ b/ports/directx12-agility/usage
@@ -1,14 +1,14 @@
-The DirectX 12 Agility SDK package provides CMake targets:
-
-    find_package(directx-headers CONFIG REQUIRED)
-    find_package(directx12-agility CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE Microsoft::DirectX-Headers Microsoft::DirectX-Guids Microsoft::DirectX12-Agility)
-
-    if(TARGET Microsoft::DirectX12-Agility)
-        file(MAKE_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/D3D12")
-        add_custom_command(TARGET main POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> $<TARGET_FILE_DIR:main>/D3D12
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Layers,IMPORTED_LOCATION_DEBUG> $<TARGET_FILE_DIR:main>/D3D12
-           COMMAND_EXPAND_LISTS
-        )
-    endif()
+The DirectX 12 Agility SDK package provides CMake targets:
+
+    find_package(directx-headers CONFIG REQUIRED)
+    find_package(directx12-agility CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectX-Headers Microsoft::DirectX-Guids Microsoft::DirectX12-Agility)
+
+    if(TARGET Microsoft::DirectX12-Agility)
+        file(MAKE_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/D3D12")
+        add_custom_command(TARGET main POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> $<TARGET_FILE_DIR:main>/D3D12
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Layers,IMPORTED_LOCATION_DEBUG> $<TARGET_FILE_DIR:main>/D3D12
+           COMMAND_EXPAND_LISTS
+        )
+    endif()
diff --git a/ports/directx12-agility/vcpkg.json b/ports/directx12-agility/vcpkg.json
index d61b2cd31e..b6c54fff19 100644
--- a/ports/directx12-agility/vcpkg.json
+++ b/ports/directx12-agility/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "directx12-agility",
-  "version": "1.619.3",
+  "version": "1.619.4",
   "description": "DirectX 12 Agility SDK",
   "homepage": "https://aka.ms/directx12agility",
   "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1aab93d913..dcae1d6b6e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2521,11 +2521,11 @@
       "port-version": 0
     },
     "directx-headers": {
-      "baseline": "1.619.1",
+      "baseline": "1.619.4",
       "port-version": 0
     },
     "directx12-agility": {
-      "baseline": "1.619.3",
+      "baseline": "1.619.4",
       "port-version": 0
     },
     "directxmath": {
diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json
index 7da698eecf..e2bc8ef04b 100644
--- a/versions/d-/directx-headers.json
+++ b/versions/d-/directx-headers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "604aa5530f61c53f4ea0f456d935398f12429c93",
+      "version": "1.619.4",
+      "port-version": 0
+    },
     {
       "git-tree": "c72ef469531efe40c3f03534597a92fe3484dd0f",
       "version": "1.619.1",
diff --git a/versions/d-/directx12-agility.json b/versions/d-/directx12-agility.json
index bf7c2c1807..067a18136a 100644
--- a/versions/d-/directx12-agility.json
+++ b/versions/d-/directx12-agility.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c6d5764870d5cb3f67025ce4fbca6432f1e47180",
+      "version": "1.619.4",
+      "port-version": 0
+    },
     {
       "git-tree": "580f82ca685a63f9a7275d13e8b1e01d92945bb5",
       "version": "1.619.3",