diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index c6383f06363eb1..13aba6dc5aee04 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -86,6 +86,7 @@ vcpkg_make_configure(
         --disable-gpac
         --disable-lsmash
         --disable-bashcompletion
+        --bindir=[debug/]bin
     OPTIONS_RELEASE
         ${OPTIONS_RELEASE}
         --enable-strip
@@ -96,10 +97,6 @@ vcpkg_make_configure(
 
 vcpkg_make_install()
 
-if("tool" IN_LIST FEATURES)
-    vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN)
-endif()
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@@ -123,6 +120,13 @@ elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     )
 endif()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        file(COPY "${CURRENT_PACKAGES_DIR}/tools/x264/bin/libx264-164.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug")
+    endif()
+endif()
+
 vcpkg_fixup_pkgconfig()
 
 vcpkg_copy_pdbs()
diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json
index c8a41629324c80..1a9b14f80a3044 100644
--- a/ports/x264/vcpkg.json
+++ b/ports/x264/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "x264",
   "version": "0.164.3108",
-  "port-version": 1,
+  "port-version": 2,
   "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
   "homepage": "https://www.videolan.org/developers/x264.html",
   "license": "GPL-2.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index f68521b7225c96..b20d4c18e4580e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9918,7 +9918,7 @@
     },
     "x264": {
       "baseline": "0.164.3108",
-      "port-version": 1
+      "port-version": 2
     },
     "x265": {
       "baseline": "4.1",
diff --git a/versions/x-/x264.json b/versions/x-/x264.json
index 6b430320b036c1..f2e6d8aa6114ef 100644
--- a/versions/x-/x264.json
+++ b/versions/x-/x264.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9bee6ff2ae0128061fb62fc4be756c80b86643c0",
+      "version": "0.164.3108",
+      "port-version": 2
+    },
     {
       "git-tree": "0b3254a0abf3a2a2748b7353594b401893f74da9",
       "version": "0.164.3108",