diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index 7ce15f38..90a1ca1b 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=6.1.0
-pkgrel=19
+pkgrel=20
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -89,13 +89,13 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 sha256sums=('803cba087e713a59866797747c3c63abbc0e4354c45cc2c0467d11e78364d66f'
             '0f25288c70ade80c7fac57d3149209b64a7ba23f00232b7e42103f6330b0c1c0'
-            '613b52b753fa9ad5e991648726ef6519845c23569ff630c9adb3db84b6046c58'
+            '9ed1492c92d9c46e117738365eee25e8fa622a92b1f4db288e919b3102be3c6b'
             '2bd47103eedebc0a18619a8866f612c3accc89544d73649987e3289af62c35af'
-            'e1a2b77526f279532cb46a6a76046adaeff4693c9ad4da41a5ff76616a187bcc'
-            '659b558831632a4d6efb9daa5a38ae8a5d3bad5fa81485fc692a04c929ef7e8b'
-            'b8cab28667f6bbe6e16d579e3dbba6abf048d5ca5762710ca51a0daefb2f5910'
-            'c3d5e802117f9adc7dc5a5f397c2f01ea98741cf7f6c94612e637d521853dc25'
-            '56e55083caf3d46ab0d36dee4b9a3b28e7b184886176dcfe93ab1ff277b5e5a4'
+            '5f62ef7f560c5215348bd26ff4a7fd9a7f8857193bbad43f139dbff7df449350'
+            '88e163e1ad63cc29614a635cbd64b02ae811c0b22ed2dba27e63e49deec0cae9'
+            '09d5073b03e2def2eeb87526904eba990bb05b503623199fa4188c3a4684b314'
+            '96d7dfa9f17424918f4efbec2c08b6cc7aa31616324382be7483b96d7559e119'
+            '274e5dc04f8213c170da2c15ffaad216846ae047a7f21a34156d64f12ce75677'
             '906b5558f5158143dfee2140a7ee464594a90c58622079f2b51a42d1db425d83'
             '167e9ffe59e55fb07d47e0c9a4bddd9d967c50ec2c8711a0a0bbe4b184fc8b0f'
             '1021dc5950ff9f9efac795688c4b53a1d3cda42b0f270ee755a038bbcf9eccab'
diff --git a/pacman/makepkg.conf b/pacman/makepkg.conf
index ca5fc99a..915fb9c8 100644
--- a/pacman/makepkg.conf
+++ b/pacman/makepkg.conf
@@ -34,6 +34,7 @@ VCSCLIENTS=('bzr::breezy'
 #
 CARCH="@CARCH@"
 CHOST="@CHOST@"
+RUST_CHOST="@CHOST@"
 
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
diff --git a/pacman/makepkg_mingw.d.clang64.conf b/pacman/makepkg_mingw.d.clang64.conf
index 61da57de..f170682a 100644
--- a/pacman/makepkg_mingw.d.clang64.conf
+++ b/pacman/makepkg_mingw.d.clang64.conf
@@ -10,3 +10,4 @@ CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -f
 CXXFLAGS="$CFLAGS"
 LDFLAGS=""
 RUSTFLAGS="-Cforce-frame-pointers=yes -Ctarget-feature=+crt-static"
+RUST_CHOST="x86_64-pc-windows-gnullvm"
diff --git a/pacman/makepkg_mingw.d.clangarm64.conf b/pacman/makepkg_mingw.d.clangarm64.conf
index 4bb5fc59..5c49cd21 100644
--- a/pacman/makepkg_mingw.d.clangarm64.conf
+++ b/pacman/makepkg_mingw.d.clangarm64.conf
@@ -10,3 +10,4 @@ CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_M
 CXXFLAGS="$CFLAGS"
 LDFLAGS=""
 RUSTFLAGS="-Cforce-frame-pointers=yes -Ctarget-feature=+crt-static"
+RUST_CHOST="aarch64-pc-windows-gnullvm"
diff --git a/pacman/makepkg_mingw.d.mingw32.conf b/pacman/makepkg_mingw.d.mingw32.conf
index 5a446b5b..808ab0cc 100644
--- a/pacman/makepkg_mingw.d.mingw32.conf
+++ b/pacman/makepkg_mingw.d.mingw32.conf
@@ -10,3 +10,4 @@ CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack
 CXXFLAGS="$CFLAGS"
 LDFLAGS="-Wl,--no-seh -Wl,--large-address-aware"
 RUSTFLAGS="-Cforce-frame-pointers=yes"
+RUST_CHOST="i686-pc-windows-gnu"
diff --git a/pacman/makepkg_mingw.d.mingw64.conf b/pacman/makepkg_mingw.d.mingw64.conf
index 437e10c2..5d5cb379 100644
--- a/pacman/makepkg_mingw.d.mingw64.conf
+++ b/pacman/makepkg_mingw.d.mingw64.conf
@@ -10,3 +10,4 @@ CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -f
 CXXFLAGS="$CFLAGS"
 LDFLAGS=""
 RUSTFLAGS="-Cforce-frame-pointers=yes"
+RUST_CHOST="x86_64-pc-windows-gnu"
diff --git a/pacman/makepkg_mingw.d.ucrt64.conf b/pacman/makepkg_mingw.d.ucrt64.conf
index bad16d3c..25d2bd32 100644
--- a/pacman/makepkg_mingw.d.ucrt64.conf
+++ b/pacman/makepkg_mingw.d.ucrt64.conf
@@ -10,3 +10,4 @@ CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -f
 CXXFLAGS="$CFLAGS"
 LDFLAGS=""
 RUSTFLAGS="-Cforce-frame-pointers=yes"
+RUST_CHOST="x86_64-pc-windows-gnu"