diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 8d21405470..71d7dc69cf 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,31 +1,30 @@
 # Template build file for 'cross-aarch64-linux-gnu'
 #
-_binutils_version=2.25
+_binutils_version=2.25.1
 _gcc_version=4.9.3
-_glibc_version=2.21
-_linux_version=3.14.34
+_glibc_version=2.22
+_linux_version=3.14.58
 
 _triplet=aarch64-linux-gnu
 _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.20
+version=0.21
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="http://www.voidlinux.eu"
-license="Public Domain"
+license="GPL-3, GPL-2, LGPL-2.1"
 distfiles="
  ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
  ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz"
-checksum="
- 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
+checksum="b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22
  2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
- aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8
- 041e2a65565dc93bb5f64422c56d3ca11057b0a2ac2287f04fe9ee9aa1ae0da2"
+ eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948
+ f4d016cb807b294988c6515c245939b2a7987ba606ad0662958bd8cb8600814b"
 
 lib32disabled=yes
 nocross=yes
@@ -262,7 +261,7 @@ do_install() {
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_sysroot}/{sbin,bin,lib,etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,lib,etc,var}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv
 	rm -f ${DESTDIR}/${_sysroot}/libexec