diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index 081c2316038b83..1206841b12ce63 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,20 +1,20 @@
 # Template file for 'avr-gcc'
 pkgname=avr-gcc
-version=9.3.0
-revision=2
+version=16.2.0
+revision=1
 short_desc="GNU C Compiler for AVR"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GFDL-1.3-or-later, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, GCC-exception-3.1"
-homepage="http://gcc.gnu.org"
-distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+maintainer="Marian Rajewski <deffkatek@gmail.com>"
+license="GFDL-1.3-or-later, GPL-3.0-or-later, GCC-exception-3.1"
+homepage="https://gcc.gnu.org"
+distfiles="${GNU_SITE}/gnu/gcc/gcc-${version}/gcc-${version}.tar.gz"
+checksum=071d00a097579e5ef7ce97fc4a9e58e73fd3503c0a013c765c970370a5a53b9b
 
-hostmakedepends="flex avr-binutils tar"
+hostmakedepends="avr-binutils tar"
 if [ "$CROSS_BUILD" ]; then
 	# Need a direct cross-compiler for libgcc.
 	hostmakedepends+=" avr-gcc"
 fi
-makedepends="zlib-devel libmpc-devel isl15-devel"
+makedepends="zlib-devel libmpc-devel isl-devel"
 depends="avr-binutils"
 nostrip=yes
 
@@ -23,12 +23,19 @@ do_configure() {
 	mkdir obj-avr
 	cd obj-avr
 
-	unset CFLAGS CXXFLAGS LDFLAGS
 	CFLAGS="-O2 -pipe" \
-	CONFIG_SHELL=/bin/bash \
+	CXXFLAGS="-O2 -pipe" \
 	LDFLAGS= \
+	CONFIG_SHELL=/bin/bash \
 	../configure \
+		--target=avr \
+		--build=$XBPS_TRIPLET \
+		--host=$XBPS_CROSS_TRIPLET \
 		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--mandir=/usr/share/man \
 		--disable-install-libiberty \
 		--disable-libssp \
 		--disable-libstdcxx-pch \
@@ -36,6 +43,8 @@ do_configure() {
 		--disable-linker-build-id \
 		--disable-nls \
 		--disable-werror \
+		--disable-__cxa_atexit \
+		--disable-gcov \
 		--enable-checking=release \
 		--enable-clocale=gnu \
 		--enable-gnu-indirect-function \
@@ -46,16 +55,12 @@ do_configure() {
 		--enable-lto \
 		--enable-plugin \
 		--enable-shared \
-		--build=$XBPS_TRIPLET \
-		--host=$XBPS_CROSS_TRIPLET \
-		--target=avr \
 		--with-isl \
 		--with-gnu-as \
 		--with-gnu-ld \
 		--with-as=/usr/bin/avr-as \
 		--with-ld=/usr/bin/avr-ld \
 		--with-plugin-ld=ld.gold \
-		--with-default-libstdcxx-abi=gcc4-compatible \
 		--with-system-zlib
 }