diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake
index a05cd2d535a061..9c1662a122ca21 100644
--- a/ports/libffi/portfile.cmake
+++ b/ports/libffi/portfile.cmake
@@ -22,8 +22,10 @@ endif()
 set(ccas_options "")
 vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")
+set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
 if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-    set(ccas "${SOURCE_PATH}/msvcc.sh")
+    vcpkg_add_to_path("${SOURCE_PATH}")
+    set(ccas "msvcc.sh")
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
         string(APPEND ccas_options " -m32")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -33,13 +35,11 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
         string(APPEND ccas_options " -marm64")
     endif()
-else()
-    set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
 endif()
-cmake_path(GET ccas PARENT_PATH ccas_dir)
-vcpkg_add_to_path("${ccas_dir}")
-cmake_path(GET ccas FILENAME ccas_command)
-vcpkg_list(APPEND options "CCAS=${ccas_command}${ccas_options}")
+vcpkg_list(APPEND options "CCAS=${ccas}")
+if(ccas_options)
+    vcpkg_list(APPEND options "CCASFLAGS=\${CCASFLAGS}${ccas_options}")
+endif()
 
 set(configure_triplets DETERMINE_BUILD_TRIPLET)
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json
index 9f8f147b2a64a5..7d5719ad1e4242 100644
--- a/ports/libffi/vcpkg.json
+++ b/ports/libffi/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libffi",
   "version": "3.4.7",
+  "port-version": 1,
   "description": "Portable, high level programming interface to various calling conventions",
   "homepage": "https://github.com/libffi/libffi",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 49ac1161c681a0..c4d4b68cb2e134 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4562,7 +4562,7 @@
     },
     "libffi": {
       "baseline": "3.4.7",
-      "port-version": 0
+      "port-version": 1
     },
     "libfido2": {
       "baseline": "1.15.0",
diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
index c44c4669609f40..4aa264e895c5a0 100644
--- a/versions/l-/libffi.json
+++ b/versions/l-/libffi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "710c324f0b7822714000ae5b5ff818ab98380f91",
+      "version": "3.4.7",
+      "port-version": 1
+    },
     {
       "git-tree": "5cd61965ff1cc223c5592da1dbc48b45a26f3705",
       "version": "3.4.7",