diff --git a/templates/binutils/devel.template b/templates/binutils/devel.template
index 1e5358cf35..a048fbfe33 100644
--- a/templates/binutils/devel.template
+++ b/templates/binutils/devel.template
@@ -10,12 +10,15 @@ Add_dependency run binutils
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr || return 1
 	for f in libopcodes libbfd libiberty; do
-		mv ${SRCPKGDESTDIR}/usr/lib/${f}.*a ${DESTDIR}/usr/lib
+		mv ${SRCPKGDESTDIR}/usr/lib/${f}.*a \
+			${DESTDIR}/usr/lib || return 1
 		if [ -f ${SRCPKGDESTDIR}/usr/lib/${f}.so ]; then
-			mv ${SRCPKGDESTDIR}/usr/lib/${f}.so ${DESTDIR}/usr/lib
+			mv ${SRCPKGDESTDIR}/usr/lib/${f}.so \
+				${DESTDIR}/usr/lib || return 1
 		fi
 	done
-	mv ${SRCPKGDESTDIR}/usr/lib/ldscripts ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/ldscripts \
+		${DESTDIR}/usr/lib || return 1
 }
diff --git a/templates/binutils/template b/templates/binutils/template
index 3e5f59945e..d531b09c8b 100644
--- a/templates/binutils/template
+++ b/templates/binutils/template
@@ -1,6 +1,6 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.19.1
+version=2.20
 distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-werror --enable-shared --enable-multilib
@@ -8,7 +8,7 @@ configure_args="--disable-werror --enable-shared --enable-multilib
 make_install_args="tooldir=/usr"
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
+checksum=e1df09f0aa3b50154ef93bfefe86d65d01c22cfb44d73299ad95e772133a75b0
 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
@@ -24,5 +24,10 @@ long_desc="
 
 base_chroot=yes
 subpackages="devel"
-
 Add_dependency run glibc
+
+post_install()
+{
+	# Remove info file that conflicts with autoconf.
+	rm -f ${DESTDIR}/usr/share/info/standards.info
+}