diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d7257b..b2a3611 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 8
+  CACHE_VERSION: 9
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
   LIBGL_ALWAYS_SOFTWARE: 'true'
@@ -532,7 +532,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win32; popd
           make distclean -C carla
-          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false -j $(nproc)
+          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false -j $(nproc)
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
@@ -605,7 +605,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win64; popd
           make distclean -C carla
-          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false all win32r -j $(nproc)
+          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false all win32r -j $(nproc)
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
           make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
diff --git a/deps/PawPaw b/deps/PawPaw
index 4834b2e..55bbe06 160000
--- a/deps/PawPaw
+++ b/deps/PawPaw
@@ -1 +1 @@
-Subproject commit 4834b2e078af3d47dde45cab88bbdfe33ec90738
+Subproject commit 55bbe0622b4a25dd30a849b9231bddcef8bcb53e
diff --git a/utils/create-macos-installer.sh b/utils/create-macos-installer.sh
index 642c40f..4ab84dd 100755
--- a/utils/create-macos-installer.sh
+++ b/utils/create-macos-installer.sh
@@ -57,7 +57,7 @@ pkgbuild \
 
 cd ..
 
-sed -e "s|@builddir@|${PWD}/build|" utils/plugin.pkg/package.xml.in > build/package.xml
+sed -e "s|@builddir@|${PWD}/build|" utils/macOS/package.xml.in > build/package.xml
 
 productbuild \
   --distribution build/package.xml \
diff --git a/utils/plugin.pkg/package.xml.in b/utils/macOS/package.xml.in
similarity index 95%
rename from utils/plugin.pkg/package.xml.in
rename to utils/macOS/package.xml.in
index 0304318..b2c8d9c 100644
--- a/utils/plugin.pkg/package.xml.in
+++ b/utils/macOS/package.xml.in
@@ -5,7 +5,7 @@
     <license file="@builddir@/../LICENSE" mime-type="text/plain" />
     <options customize="always" hostArchitectures="x86_64" require-scripts="false" rootVolumeOnly="true" />
     <pkg-ref id="studio.kx.distrho.cardinal" />
-    <welcome file="@builddir@/welcome.txt" mime-type="text/plain" />
+    <welcome file="@builddir@/../utils/macOS/welcome.txt" mime-type="text/plain" />
     <choice id="studio.kx.distrho.cardinal-res" title="Resources" description="Install resources" visible="false">
         <pkg-ref id="studio.kx.distrho.cardinal-resources" version="0">dpf-cardinal-resources.pkg</pkg-ref>
     </choice>
diff --git a/utils/plugin.pkg/welcome.txt.in b/utils/macOS/welcome.txt
similarity index 100%
rename from utils/plugin.pkg/welcome.txt.in
rename to utils/macOS/welcome.txt