diff --git a/ports/libftdi/dont_use_lib64.patch b/ports/libftdi/dont_use_lib64.patch
new file mode 100644
index 0000000000..cebc17393f
--- /dev/null
+++ b/ports/libftdi/dont_use_lib64.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b68de29..2eda29e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+     SET(LIB_SUFFIX "")
+     SET(PACK_ARCH "")
+   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-    SET(LIB_SUFFIX 64)
++    SET(LIB_SUFFIX "")
+     SET(PACK_ARCH .x86_64)
+ endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ 
diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake
index a4a3b0c87e..f44801849c 100644
--- a/ports/libftdi/portfile.cmake
+++ b/ports/libftdi/portfile.cmake
@@ -11,12 +11,13 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         libusb-win32.patch
         shared-static.patch
+        dont_use_lib64.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src")
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     PREFER_NINJA
     OPTIONS
         -DDOCUMENTATION=OFF
@@ -27,16 +28,23 @@ vcpkg_configure_cmake(
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
 
-        -DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+        "-DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include"
+
+        -DLIB_INSTALL_DIR=lib
 )
 
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_fixup_pkgconfig()
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libftdi)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE ${CURRENT_PACKAGES_DIR}/share/libftdi/copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libftdi")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE" "${CURRENT_PACKAGES_DIR}/share/libftdi/copyright")
 
 vcpkg_copy_pdbs()
+
+# Delete pkgconfig files for ftdipp since we did -DFTDIPP=OFF above
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftdipp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftdipp.pc")
diff --git a/ports/libftdi/vcpkg.json b/ports/libftdi/vcpkg.json
index 953acd0b86..b6300d9dd2 100644
--- a/ports/libftdi/vcpkg.json
+++ b/ports/libftdi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libftdi",
   "version-string": "0.20",
-  "port-version": 2,
+  "port-version": 3,
   "description": "FTDI USB driver with bitbang mode (v0.20)",
   "dependencies": [
     "libusb-win32"
diff --git a/versions/baseline.json b/versions/baseline.json
index 011091d02e..cbbdd60048 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3426,7 +3426,7 @@
     },
     "libftdi": {
       "baseline": "0.20",
-      "port-version": 2
+      "port-version": 3
     },
     "libftdi1": {
       "baseline": "1.5",
diff --git a/versions/l-/libftdi.json b/versions/l-/libftdi.json
index e2fbf946ae..e269393c73 100644
--- a/versions/l-/libftdi.json
+++ b/versions/l-/libftdi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d9ba20048c2bbea3f1155e42faad0ab3b8a7e3f2",
+      "version-string": "0.20",
+      "port-version": 3
+    },
     {
       "git-tree": "432b2ffb3de6957b3569862e61d431171c916624",
       "version-string": "0.20",