diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index ec6a11ad02c..f912080a246 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -12,7 +12,7 @@ _fpuflags="--with-float=hard"
 _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 
 pkgname=cross-${_triplet}
-version=0.6
+version=0.7
 revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="pancake <pancake@nopcode.org>"
@@ -353,9 +353,16 @@ do_install() {
 	# install cross gcc
 	cd ${wrksrc}/gcc-final && make DESTDIR=${DESTDIR} install
 
+	# install linux API headers for MIPS
+	cd ${wrksrc}/linux-${_linux_version} && \
+		make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
+		headers_install
+	rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
+	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
+
 	# install glibc for target
 	cd ${wrksrc}/glibc-final && \
-		make install_root=${DESTDIR}/${_CROSS_SYSROOT} install
+		make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
 
 	# XXX hard-float only toolchain.
 	ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
@@ -364,13 +371,6 @@ do_install() {
 	ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/ld-linux-armhf.so.3 \
 		${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/ld-linux.so.3
 
-	# install linux API headers for MIPS
-	cd ${wrksrc}/linux-${_linux_version} && \
-		make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
-		headers_install
-	rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
-	rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
-
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share