diff --git a/mingw-w64-avr-gcc/PKGBUILD b/mingw-w64-avr-gcc/PKGBUILD
index efa2d64f30..c7df2017e4 100644
--- a/mingw-w64-avr-gcc/PKGBUILD
+++ b/mingw-w64-avr-gcc/PKGBUILD
@@ -5,11 +5,11 @@ _target=avr
 
 pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}
-pkgver=8.5.0
+pkgver=12.2.0
 pkgrel=1
 pkgdesc='GNU compiler collection for AVR 8-bit and 32-bit microcontrollers (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 license=('GPL')
 url='https://www.gnu.org/software/gcc/gcc.html'
 options=(!strip)
@@ -18,17 +18,27 @@ depends=("${MINGW_PACKAGE_PREFIX}-${_target}-binutils"
          "${MINGW_PACKAGE_PREFIX}-gmp"
          "${MINGW_PACKAGE_PREFIX}-isl"
          "${MINGW_PACKAGE_PREFIX}-mpc"
-         "${MINGW_PACKAGE_PREFIX}-mpfr")
+         "${MINGW_PACKAGE_PREFIX}-mpfr"
+         "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
+         "${MINGW_PACKAGE_PREFIX}-zstd")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 source=(https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz{,.sig})
-sha256sums=('d308841a511bb830a6100397b0042db24ce11f642dab6ea6ee44842e5325ed50'
+sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
             'SKIP')
-validpgpkeys=('D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62')
+validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
+              86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
+              13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
+              D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
 
 build() {
     [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
     mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
+    if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
+        CFLAGS+=" -Wno-int-conversion"
+    fi
+
     ../${_realname}-${pkgver}/configure \
         --build=${MINGW_CHOST} \
         --prefix=${MINGW_PREFIX} \
@@ -42,6 +52,7 @@ build() {
         --disable-libada \
         --with-dwarf2 \
         --enable-mingw-wildcard
+
     make
 }