diff --git a/mingw-w64-libhdr10plus-rs/PKGBUILD b/mingw-w64-libhdr10plus-rs/PKGBUILD
index be6b8636b8..c2b28b5f60 100644
--- a/mingw-w64-libhdr10plus-rs/PKGBUILD
+++ b/mingw-w64-libhdr10plus-rs/PKGBUILD
@@ -1,12 +1,12 @@
 _realname=libhdr10plus
 _sourcename=hdr10plus_tool
-pkgbase=mingw-w64-${_realname}
+pkgbase=mingw-w64-${_realname}-rs
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-rs
 pkgver=2.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Library to read and write HDR10+ metadata (C-API)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/quietvoid/hdr10plus_tool/tree/main/hdr10plus'
 license=('spdx:MIT')
 msys2_references=(
@@ -15,20 +15,21 @@ msys2_references=(
 )
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-cargo-c")
-source=("https://github.com/quietvoid/hdr10plus_tool/archive/refs/tags/${_realname}-${pkgver}.tar.gz")
+source=("https://github.com/quietvoid/hdr10plus_tool/archive/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c46908d70caa77053804a2e88a2b0e158e6bf67e10bb21b30d585ad8fb27cf6b')
 
 prepare() {
-  cd "${srcdir}/${_sourcename}-${_realname}-${pkgver}/hdr10plus"
+  cd "${_sourcename}-${_realname}-${pkgver}/hdr10plus"
 
-  cargo fetch
+  cargo fetch --locked
 }
 
 build() {
-  cd "${srcdir}/${_sourcename}-${_realname}-${pkgver}/hdr10plus"
+  cd "${_sourcename}-${_realname}-${pkgver}/hdr10plus"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
     cargo cbuild \
+      --meson-paths \
       --release \
       --frozen \
       --all-features \
@@ -36,7 +37,7 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${_sourcename}-${_realname}-${pkgver}/hdr10plus"
+  cd "${_sourcename}-${_realname}-${pkgver}/hdr10plus"
 
   cargo test \
     --release \
@@ -45,15 +46,16 @@ check() {
 }
 
 package() {
-  cd "${srcdir}/${_sourcename}-${_realname}-${pkgver}/hdr10plus"
+  cd "${_sourcename}-${_realname}-${pkgver}/hdr10plus"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
     cargo cinstall \
-        --release \
-        --frozen \
-        --all-features \
-        --prefix="${MINGW_PREFIX}" \
-        --destdir="${pkgdir}"
+      --meson-paths \
+      --release \
+      --frozen \
+      --all-features \
+      --prefix="${MINGW_PREFIX}" \
+      --destdir="${pkgdir}"
 
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-rs/LICENSE"
 }