diff --git a/srcpkgs/binutils/binutils-devel.template b/srcpkgs/binutils/binutils-devel.template
index 9886569ce3..78f3e59da0 100644
--- a/srcpkgs/binutils/binutils-devel.template
+++ b/srcpkgs/binutils/binutils-devel.template
@@ -1,10 +1,7 @@
 # Template file for 'binutils-devel'.
 #
 depends="binutils>=$version"
-short_desc="binutils development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} -- development files"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index a2786e67cc..d513c82bfc 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.23.51.0.3
-revision=1
+revision=2
 makedepends="flex perl"
 subpackages="$pkgname-devel"
 short_desc="GNU binary utilities"
@@ -10,23 +10,19 @@ homepage="http://www.gnu.org/software/binutils/"
 license="GPL-3"
 distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz"
 checksum=2162905dabf191a2a803eab8d31e7be52d96d6ccd1e0ce42e25d82c6be918cd0
-long_desc="
- The GNU binutils package contains essential tools to assemble, link and
- manipulate binary and object files. They are often used with a compiler
- and additional libraries for building software.
 
- It includes the GNU linker, the portable GNU assembler, ar for modifying
- archives (such as libraries), nm for listing symbols from object files,
- objdump for displaying object file information, ranlib for generating
- archive indexes, size for listing section sizes of object files,
- strings for outputing the printable characters in files, strip for
- stripping out symbols (like debugging information) from object files,
- and other tools."
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	crossmakedepends="libfl-devel zlib-devel"
+fi
 
 do_configure() {
+	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
+	fi
+
 	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
-		--enable-64-bit-bfd --enable-multilib --enable-plugins \
-		--enable-secureplt --with-mmap --enable-shared
+		--enable-plugins --enable-secureplt --with-mmap \
+		--enable-shared --disable-bootstrap $CONFIGFLAG
 }
 
 do_build() {
@@ -56,6 +52,10 @@ do_install() {
 
 	make DESTDIR=${DESTDIR} tooldir=/usr install
 
+	# Remove ld.bfd (hardlink) and make a symlink.
+	rm -f ${DESTDIR}/usr/bin/ld.bfd
+	ln -sfr ${DESTDIR}/usr/bin/ld ${DESTDIR}/usr/bin/ld.bfd
+
 	# Add some useful headers
 	install -m644 include/libiberty.h ${DESTDIR}/usr/include
 	install -m644 include/demangle.h ${DESTDIR}/usr/include