diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 441e4355390..36b71c2b5e9 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.39
-revision=2
+revision=3
 bootstrap=yes
 hostmakedepends="pkgconf"
 makedepends="zlib-devel"
@@ -12,7 +12,11 @@ homepage="http://www.gnu.org/software/binutils/"
 distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
 checksum=645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
 
+build_options="all_targets"
+desc_option_all_targets="Enable all supported targets"
+
 subpackages="binutils-doc"
+
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends+=" flex perl texinfo"
 	makedepends+=" elfutils-devel"
@@ -47,7 +51,7 @@ do_configure() {
 
 	# gprofng currently only supports x86 and aarch64 glibc.
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64|i386|aarch64) conf+=" --enable-gprofng" ;;
+		x86_64|i686|aarch64) conf+=" --enable-gprofng" ;;
 		*) conf+=" --disable-gprofng" ;;
 	esac
 
@@ -55,14 +59,20 @@ do_configure() {
 		ppc*)
 			conf+=" --enable-secureplt"
 			;;
-		x86_64*)
-			conf+=" --enable-targets=x86_64-pep"
-			;;
-		i686*)
-			conf+=" --enable-targets=x86_64-linux-gnu,x86_64-pep"
+		x86_64*|i686*)
+			extra_targets=x86_64-pep
 			;;
 	esac
 
+	# target archs supported by Void
+	# borked: riscv64 (gold doesn't support it)
+	void_targets="aarch64,armv5tel,armv6l,armv7l,i686,mips,mipsel,ppc,ppcle,ppc64,ppc64le,x86_64"
+	conf+=" --enable-targets=$(echo "$void_targets" | sed -E -e 's/(,|$)/-linux-gnu\1/g'),${extra_targets}"
+
+	if [ "$build_option_all_targets" ]; then
+		conf+=" --enable-targets=all"
+	fi
+
 	# enable multilib on x86_64 glibc
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		conf+=" --enable-multilib"