diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index 247126af46..3022aaea49 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -2,7 +2,7 @@
 . ${XBPS_SRCPKGDIR}/kernel/common-vars
 
 pkgname=kernel-libc-headers
-#revision=1
+revision=1
 build_style=custom-install
 short_desc="The Linux kernel headers for development"
 long_desc="
@@ -13,14 +13,15 @@ nostrip=yes
 
 do_build()
 {
-	make headers_check || return 1
+	make headers_check
 }
 
 do_install()
 {
-	make INSTALL_HDR_PATH=${DESTDIR}/usr headers_install || return 1
+	make INSTALL_HDR_PATH=${DESTDIR}/usr headers_install
 	# Install scsi/scsi.h header, required by eject and others.
-	install -m644 ${wrksrc}/include/scsi/scsi.h ${DESTDIR}/usr/include/scsi
+	sed -i -e "/^\#include <linux\/scatterlist.h>$/d" include/scsi/scsi.h
+	install -m644 include/scsi/scsi.h ${DESTDIR}/usr/include/scsi
 }
 
 post_install()