diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index f593fb008df..e0ca53898a1 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.21
-revision=4
+revision=5
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 homepage="http://www.voidlinux.eu"
@@ -227,7 +227,7 @@ do_build() {
 }
 
 do_install() {
-	for f in include lib libexec bin sbin; do
+	for f in include libexec bin sbin; do
 		if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
 			mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
 		fi
@@ -236,6 +236,10 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	mkdir -p ${DESTDIR}/${_sysroot}/usr/lib
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib64
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib
 
 	# install cross binutils
 	cd ${wrksrc}/binutils-build
@@ -255,16 +259,10 @@ do_install() {
 	cd ${wrksrc}/glibc-build
 	make install_root=${DESTDIR}/${_sysroot} install install-headers
 
-	# Move files to /usr/lib (lib64).
-	if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then
-		mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/
-		rmdir ${DESTDIR}/${_sysroot}/usr/lib64
-	fi
-
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_sysroot}/{sbin,lib,etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,etc,var}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv
 	rm -f ${DESTDIR}/${_sysroot}/libexec