diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index bb110f63fb2..6bf03c24f71 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -2,30 +2,37 @@
 #
 pkgname=kernel-libc-headers
 version=3.7.1
-revision=1
+revision=2
 wrksrc=linux-${version}
+short_desc="The Linux API headers for userland development"
+license="GPL-2"
 homepage="http://www.kernel.org"
 distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
 checksum=e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255
-if [ -n "$IN_CHROOT" ]; then
-	makedepends="perl"
-fi
-short_desc="The Linux kernel headers for development"
-license="GPL-2"
-long_desc="
- This package provides the linux kernel headers for use in userspace."
 
 bootstrap=yes
 nostrip=yes
 noverifyrdeps=yes
 
+if [ -n "$IN_CHROOT" ]; then
+	makedepends="perl"
+fi
+
+if [ "$XBPS_MACHINE" = "i686" -o "$XBPS_MACHINE" = "x86_64" ]; then
+	_arch="ARCH=x86"
+elif [ "$XBPS_MACHINE" = "armv6l" ]; then
+	_arch="ARCH=arm"
+else
+	msg_error "$pkgver: unknown architecture.\n"
+fi
+
 do_build() {
 	make mrproper
-	make headers_check
+	make ${_arch} headers_check
 }
 
 do_install() {
-	make INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
+	make ${_arch} INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
 	# Remove unused files.
 	rm -f $(find ${DESTDIR}/usr/include -name .install -or -name ..install.cmd)
 	# Remove drm headers, use libdrm.