diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 5b736c2e3a2..8a0b3f1efff 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=3
+revision=4
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -36,7 +36,7 @@ do_configure() {
 	if [ "$CHROOT_READY" ]; then
 		conf+=" --with-debuginfod"
 	else
-		conf+=" --without-debuginfod"
+		conf+=" --without-debuginfod --disable-install-libbfd"
 	fi
 	if [ "$CROSS_BUILD" ]; then
 		# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
@@ -85,7 +85,6 @@ do_configure() {
 		--enable-deterministic-archives \
 		--enable-64-bit-bfd \
 		--enable-ld=default \
-		--enable-install-libiberty \
 		--with-system-zlib \
 		--with-mmap \
 		--with-pic \
@@ -116,13 +115,15 @@ do_install() {
 	rm -f ${DESTDIR}/usr/bin/ld
 	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
 
-	# Remove these symlinks, they are not ABI stable.
-	# Programs should compile static to the .a file.
-	rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so
-	echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" \
-		>${DESTDIR}/usr/lib/libbfd.so
-	echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
-		>${DESTDIR}/usr/lib/libopcodes.so
+	if [ "$CHROOT_READY" ]; then
+		# Remove these symlinks, they are not ABI stable.
+		# Programs should compile static to the .a file.
+		rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so
+		echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" \
+			>${DESTDIR}/usr/lib/libbfd.so
+		echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
+			>${DESTDIR}/usr/lib/libopcodes.so
+	fi
 
 	# Remove useless manpages.
 	for f in dlltool nlmconv windres windmc; do
@@ -136,6 +137,9 @@ do_install() {
 
 binutils-devel_package() {
 	depends="zlib-devel"
+	if [ "$CHROOT_READY" ]; then
+		depends+=" libiberty-devel"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include