diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh
index 9992def..dfae33f 100755
--- a/.github/workflows/bootstrap-deps.sh
+++ b/.github/workflows/bootstrap-deps.sh
@@ -71,7 +71,7 @@ case "${1}" in
     ;;
     *)
         apt-get update -qq
-        apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libffi-dev libglib2.0-dev-bin libreadline-dev libtool lsb-release make meson gperf patchelf uuid-dev zlib1g-dev
+        apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf uuid-dev zlib1g-dev
 
         linux_arch=$(get_linux_deb_arch "${1}")
         release=$(lsb_release -cs 2>/dev/null)
@@ -111,7 +111,7 @@ case "${1}" in
         elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
             dpkg --add-architecture i386
             apt-get update -qq
-            apt-get install -yqq autopoint mingw-w64
+            apt-get install -yqq autopoint libffi-dev libreadline-dev mingw-w64
             if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
                 apt-get install -yqq wine wine32 wine64
             else
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index e653e50..fe7386e 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 4
   DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_TESTS: 1
 
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index 01ac2ee..ebb7ce1 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -357,7 +357,7 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # libffi
 
-if [ "${WIN32}" -eq 1 ]; then
+if [ "${LINUX}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
     LIBFFI_EXTRAFLAGS="--disable-multi-os-directory --disable-raw-api"
 
     download libffi "${LIBFFI_VERSION}" "${LIBFFI_URL}"