diff --git a/build/windows/1_build-deps-msys2.ps1 b/build/windows/1_build-deps-msys2.ps1
index c2e3c30b06..e155cf7698 100644
--- a/build/windows/1_build-deps-msys2.ps1
+++ b/build/windows/1_build-deps-msys2.ps1
@@ -46,7 +46,7 @@ if ("$PSCommandPath" -like "*1_build-deps-msys2.ps1*" -or "$CI_JOB_NAME" -like "
   {
     pacman --noconfirm -Suy
   }
-pacman --noconfirm -S --needed $MINGW_PACKAGE_PREFIX-toolchain (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','')
+pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','')
 Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K"
 
 
diff --git a/build/windows/1_build-deps-quasimsys2.sh b/build/windows/1_build-deps-quasimsys2.sh
index a8990323d9..76e1eea30a 100644
--- a/build/windows/1_build-deps-quasimsys2.sh
+++ b/build/windows/1_build-deps-quasimsys2.sh
@@ -51,7 +51,7 @@ cd ..
 ## Install the required (pre-built) packages for babl, GEGL and GIMP
 echo -e "\e[0Ksection_start:`date +%s`:deps_install[collapsed=true]\r\e[0KInstalling dependencies provided by MSYS2"
 echo ${MSYSTEM_PREFIX^^} > quasi-msys2/msystem.txt
-deps=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
+deps=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt | sed 's/toolchain/clang/g' |
        sed "s/\${MINGW_PACKAGE_PREFIX}-/_/g"         | sed 's/\\//g')
 cd quasi-msys2
 make install _clang $deps || $true
diff --git a/build/windows/all-deps-uni.txt b/build/windows/all-deps-uni.txt
index 5c31b4dacf..838e9a3dae 100644
--- a/build/windows/all-deps-uni.txt
+++ b/build/windows/all-deps-uni.txt
@@ -5,6 +5,7 @@ ${MINGW_PACKAGE_PREFIX}-gobject-introspection \
 ${MINGW_PACKAGE_PREFIX}-headers-git \
 ${MINGW_PACKAGE_PREFIX}-libxslt \
 ${MINGW_PACKAGE_PREFIX}-meson \
+${MINGW_PACKAGE_PREFIX}-toolchain
 ${MINGW_PACKAGE_PREFIX}-vala \
 
 ${MINGW_PACKAGE_PREFIX}-aalib \