diff --git a/common/shlibs b/common/shlibs
index f764d0415846b9..9fb98da0251cef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1362,7 +1362,7 @@ libgda-ui-5.0.so.4 libgda-5.2.9_4
 libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
-libunistring.so.2 libunistring-0.9.4_1
+libunistring.so.5 libunistring-1.4.1_1
 libguile-3.0.so.1 libguile-3.0.10_1
 libopts.so.25 libopts-5.18.4_6
 libanjuta-3.so.0 anjuta-3.8.4_1
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index fa56045df0b174..456f3f827ba81f 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
 version=0.67
-revision=4
+revision=5
 bootstrap=yes
 metapackage=yes
 short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -17,7 +17,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 depends+="
- base-files binutils gcc gcc-ada libada-devel
+ base-files chroot-binutils gcc gcc-ada libada-devel
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index aa49ce56c945b7..cc374516193014 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,8 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.44
-revision=2
-bootstrap=yes
+revision=3
 hostmakedepends="pkgconf tar"
 makedepends="zlib-devel libzstd-devel"
 short_desc="GNU binary utilities"
@@ -12,6 +11,8 @@ homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
 checksum=ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237
 
+conflicts="chroot-binutils>=0"
+
 build_options="all_targets"
 desc_option_all_targets="Enable all supported targets"
 
diff --git a/srcpkgs/chroot-binutils/patches b/srcpkgs/chroot-binutils/patches
new file mode 120000
index 00000000000000..046f17d4d29e73
--- /dev/null
+++ b/srcpkgs/chroot-binutils/patches
@@ -0,0 +1 @@
+../binutils/patches/
\ No newline at end of file
diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template
new file mode 100644
index 00000000000000..0dccbc7607445b
--- /dev/null
+++ b/srcpkgs/chroot-binutils/template
@@ -0,0 +1,119 @@
+# Template file for 'chroot-binutils'
+pkgname=chroot-binutils
+version=2.44
+revision=1
+bootstrap=yes
+hostmakedepends="pkgconf tar"
+makedepends="zlib-devel libzstd-devel"
+short_desc="GNU binary utilities"
+maintainer="kim <grufwub@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://www.gnu.org/software/binutils/"
+distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
+checksum=ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237
+
+provides="binutils-${version}_${revision}"
+conflicts="binutils>=0"
+
+
+
+_get_triplet() {
+	if [ -z "$XBPS_TRIPLET" ]; then
+		echo $(
+			source "${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh"
+			echo "$XBPS_TRIPLET"
+		)
+	else
+		echo "$XBPS_TRIPLET"
+	fi
+}
+
+do_configure() {
+	local conf
+
+	sed -i "
+		s;zlibinc=\$;&-I${XBPS_MASTERDIR}/usr/include;
+		s;zlibdir=\$;&-L${XBPS_MASTERDIR}/usr/lib;
+	" */configure
+
+	if [ "$CROSS_BUILD" ]; then
+		# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
+		conf+=" --host=${XBPS_CROSS_TRIPLET} --with-build-sysroot=${XBPS_CROSS_BASE}"
+		# pkgconf adds sysroot includes to cflags and ldflags, which breaks binutils cross-compile with zstd
+		vsed -e '/PKG_CONFIG_SYSROOT_DIR/d' -i ${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*)
+			conf+=" --enable-secureplt"
+			;;
+		x86_64*|i686*)
+			extra_targets=x86_64-pep
+			;;
+	esac
+
+	# target archs supported by Void
+	void_targets="aarch64,armv5tel,armv6l,armv7l,i686,mips,mipsel,ppc,ppcle,ppc64,ppc64le,riscv64,x86_64"
+	conf+=" --enable-targets=$(echo "$void_targets" | sed -E -e 's/(,|$)/-linux-gnu\1/g'),${extra_targets}"
+
+	# enable multilib on x86_64 glibc
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		conf+=" --enable-multilib"
+	else
+		conf+=" --disable-multilib"
+	fi
+
+	# ensure softfloat on sf mips targets and set the default hash style
+	case "$XBPS_TARGET_MACHINE" in
+		mips*hf*) conf+=" --enable-default-hash-style=sysv" ;;
+		mips*) conf+=" --without-fp --enable-default-hash-style=sysv" ;;
+		*) conf+=" --enable-default-hash-style=gnu";;
+	esac
+
+	mkdir build && cd build
+	../configure --build=$(_get_triplet) \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--sysconfdir=/etc \
+		--disable-werror \
+		--disable-nls \
+		--enable-threads \
+		--enable-deterministic-archives \
+		--without-debuginfod \
+		--disable-gprofng \
+		--disable-shared \
+		--enable-64-bit-bfd \
+		--enable-ld=default \
+		--with-system-zlib \
+		--with-mmap \
+		--with-pic \
+		--with-zstd \
+		$conf
+}
+
+do_build() {
+	cd ${wrksrc}/build && make ${makejobs} ${_makeinfo}
+}
+
+do_install() {
+	cd ${wrksrc}/build
+
+	local _triplet=$(_get_triplet)
+	make DESTDIR=${DESTDIR} tooldir=/usr install ${_makeinfo}
+
+	cd ..
+
+	# Remove ld (hardlink) and make a symlink to ld.bfd.
+	rm -f ${DESTDIR}/usr/bin/ld
+	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
+
+	# Remove useless manpages.
+	for f in dlltool nlmconv windres windmc; do
+		rm -f ${DESTDIR}/usr/share/man/man1/${f}.1
+	done
+
+	# Create triplet symlinks
+	for f in ${DESTDIR}/usr/bin/*; do
+		ln -s ${f##*/} ${DESTDIR}/usr/bin/${XBPS_CROSS_TRIPLET:-${_triplet}}-${f##*/}
+	done
+}
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 5afe0db4464bff..6f36f1725bbe60 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,7 +1,7 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
 version=2.49.0
-revision=1
+revision=2
 bootstrap=yes
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
@@ -12,11 +12,6 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628
 repository=bootstrap
 
-if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
-	makedepends+=" libcurl-devel"
-fi
-
 do_configure() {
 	cat <<-EOF >config.mak
 	prefix = /usr
@@ -60,9 +55,6 @@ do_configure() {
 
 do_build() {
 	make ${makejobs} git
-	if [ "$CHROOT_READY" ]; then
-		make ${makejobs} git-http-fetch git-remote-http
-	fi
 }
 
 do_check() {
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 544eaa7a642257..9ce42540a6fb64 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
 
 pkgname=gcc
 version=14.2.1+20250405
-revision=4
+revision=5
 bootstrap=yes
 _patchver="${version%+*}"
 _minorver="${version%.*}"
@@ -58,6 +58,11 @@ depends="binutils libgcc-devel-${version}_${revision}
 checkdepends="dejagnu"
 subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
 
+if [ ! "$CHROOT_READY" ]; then
+	# Use chroot-binutils when bootstrapping
+	depends="${depends/binutils/chroot-binutils}"
+fi
+
 build_options="ada gnatboot bindist gccbin"
 build_options_default="ada"
 desc_option_ada="Enable Ada build"
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 9c333045b1f2e9..264bffbd1b0c03 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 3264f3ee0d2654..3177f76069ac55 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,7 +1,7 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-valgrind-tests
  --disable-rpath
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 5a3e919ce79516..880d7f38cf98ed 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,7 +1,7 @@
 # Template file for 'guile'
 pkgname=guile
 version=3.0.11
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning
  --with-libgmp-prefix=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index cd8887c6361901..1102d9c03627a8 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,7 +1,7 @@
 # Template file for 'lagrange'
 pkgname=lagrange
 version=1.20.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DTFDN_ENABLE_SSE41=NO"
 hostmakedepends="pkg-config zip"
diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template
index ef8d4fc0bb3382..200bef2487b777 100644
--- a/srcpkgs/libidn2/template
+++ b/srcpkgs/libidn2/template
@@ -1,7 +1,7 @@
 # Template file for 'libidn2'
 pkgname=libidn2
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext-devel libtool pkg-config gtk-doc"
 makedepends="libunistring-devel"
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 647785fbb3d047..e0c4c5890506ac 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-runtime=libidn2
  --with-psl-distfile=/usr/share/publicsuffix/public_suffix_list.dafsa
diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template
index b63f9bbb9422fa..707e95e355a039 100644
--- a/srcpkgs/libratbag/template
+++ b/srcpkgs/libratbag/template
@@ -1,7 +1,7 @@
 # Template file for 'libratbag'
 pkgname=libratbag
 version=0.18
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtests=false -Dsystemd-unit-dir=''
  -Dsystemd=false -Db_ndebug=false"
diff --git a/srcpkgs/libt3widget/template b/srcpkgs/libt3widget/template
index 402285d544ef91..e61f74cfc80c20 100644
--- a/srcpkgs/libt3widget/template
+++ b/srcpkgs/libt3widget/template
@@ -1,7 +1,7 @@
 # Template file for 'libt3widget'
 pkgname=libt3widget
 version=1.2.2
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr LIBTOOL=./hack/libtool"
 hostmakedepends="pkg-config gettext autoconf automake libtool"
diff --git a/srcpkgs/libt3window/template b/srcpkgs/libt3window/template
index 78e2ba8533e4e3..73c6d5b7592ce0 100644
--- a/srcpkgs/libt3window/template
+++ b/srcpkgs/libt3window/template
@@ -1,7 +1,7 @@
 # Template file for 'libt3window'
 pkgname=libt3window
 version=0.4.2
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr LIBTOOL=./hack/libtool"
 hostmakedepends="pkg-config gettext autoconf automake libtool"
diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template
index 296c327fd895b9..996bc2a12ca994 100644
--- a/srcpkgs/libunistring/template
+++ b/srcpkgs/libunistring/template
@@ -1,6 +1,6 @@
 # Template file for 'libunistring'
 pkgname=libunistring
-version=1.0
+version=1.4.1
 revision=1
 build_style=gnu-configure
 short_desc="Library for manipulating Unicode strings and C strings"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libunistring"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544
+checksum=12542ad7619470efd95a623174dcd4b364f2483caf708c6bee837cb53a54cb9d
 
 libunistring-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 8445f011e3f087..6b6505f99e3112 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,7 +1,7 @@
 # Template file for 'lnav'
 pkgname=lnav
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake openssh zlib-devel"
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 5704c264d66844..ced50cd6e77b32 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
 # Template file for 'notcurses'
 pkgname=notcurses
 version=3.0.9
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DUSE_STATIC=ON -DUSE_QRCODEGEN=On $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 9d4da2ee276241..614b906e0cda54 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,7 +1,7 @@
 # Template file for 'rygel'
 pkgname=rygel
 version=0.44.2
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=false -Dtests=false"
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 44aaf9726a362f..e720db909b00a6 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.11.1
-revision=1
+revision=2
 # upstream explicitly hardcodes to use glibc:
 # https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c
 archs="~*-musl"
diff --git a/srcpkgs/tilde/template b/srcpkgs/tilde/template
index b9d7065585b892..20ff3e6aae64f5 100644
--- a/srcpkgs/tilde/template
+++ b/srcpkgs/tilde/template
@@ -1,7 +1,7 @@
 # Template file for 'tilde'
 pkgname=tilde
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr"
 hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index e86a94e156b8ec..d14e39fc69fce1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
 # Template file for 'zmap'
 pkgname=zmap
 version=4.3.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="flex byacc gengetopt pkg-config"
 makedepends="libpcap-devel gmp-devel json-c-devel libunistring-devel