diff --git a/gcc-armhf/APKBUILD b/gcc-armhf/APKBUILD
index 722c9b700..943455709 100644
--- a/gcc-armhf/APKBUILD
+++ b/gcc-armhf/APKBUILD
@@ -370,7 +370,9 @@ package() {
 	rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi*
 	find "$pkgdir" -name 'ffi*.h' | xargs rm -f
 
-	mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/lib
+	local gdblib=${_target:+$CTARGET/}lib
+	mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib
+		"$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
 
 	paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1
 
diff --git a/musl-armhf/APKBUILD b/musl-armhf/APKBUILD
index b98ae1a49..5e707a661 100644
--- a/musl-armhf/APKBUILD
+++ b/musl-armhf/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=9
 subpackages="musl-dev-armhf:package_dev"
 
 _arch="armhf"
-_mirror="https://mirror1.hs-esslingen.de/pub/Mirrors/alpine/"
+_mirror="https://nl.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"