diff --git a/community/mingw-w64-gcc/APKBUILD b/community/mingw-w64-gcc/APKBUILD
index 0258d569d26dcb1b81b3bd085b2909a828b20b39..c311cc67f57be19454140b10255b24ee7e936b28 100644
--- a/community/mingw-w64-gcc/APKBUILD
+++ b/community/mingw-w64-gcc/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:
 pkgname=mingw-w64-gcc
 pkgver=12.2.0
-pkgrel=0
-_islver=0.24
+pkgrel=1
+_islver=0.25
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 url="https://gcc.gnu.org"
 arch="x86_64 x86"
@@ -31,12 +31,17 @@ _gccdir="$srcdir"/gcc-build-$_target
 
 prepare() {
 	default_prepare
+
+	# link isl for in-tree builds
+	ln -sf ../isl-$_islver isl
+
 	mkdir -p "$_gccdir"
 }
 
 build() {
 	export CFLAGS="$CFLAGS -O2"
 	export CXXFLAGS="$CXXFLAGS -O2"
+	export CPPFLAGS="$CPPFLAGS -O2"
 	cd "$_gccdir"
 	"$builddir"/configure \
 		--prefix=/usr \
@@ -45,6 +50,7 @@ build() {
 		--disable-dw2-exceptions \
 		--disable-multilib \
 		--disable-nls \
+		--disable-sjlj-exceptions \
 		--disable-werror \
 		--enable-checking=release \
 		--enable-cloog-backend=isl \
@@ -56,6 +62,7 @@ build() {
 		--enable-shared \
 		--enable-static \
 		--enable-threads=posix \
+		--with-bugurl="https://gitlab.alpinelinux.org/alpine/aports/-/issues" \
 		--with-system-zlib
 	make
 }
@@ -79,6 +86,6 @@ package() {
 
 sha512sums="
 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173  mingw-w64-gcc-12.2.0.tar.xz
-aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95  isl-0.24.tar.bz2
+d309388d7dc1c861fddf74dbcc0f15b0166b166d0ed694473445ec47eb7d3dfab96412554016b3e06292f01967441546783ab329829dc4df4b9813716e2ef9ed  isl-0.25.tar.bz2
 8266eae8b3be5557e8cd79c21b6326db7cd83604db6d6ad83923798650fcd8d0f9f1f4ed424c816a48e91f21fb1852ab9272c73100b219f07d3bbb566bfd6fae  0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
 "