diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 27bec01aa5d..d1ec61d5f3a 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
 depends="dracut linux-firmware module-init-tools"
-makedepends="perl kmod openssl which"
+makedepends="perl kmod openssl which elfutils"
 subpackages="kernel-snapshot-headers"
 triggers="kernel-hooks"
 short_desc="The Linux kernel and modules (testing snapshot)"
@@ -135,17 +135,6 @@ do_install() {
 	fi
 	cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
 
-	# Add headers for lirc package
-	mkdir -p ${hdrdest}/drivers/media/video
-	cp drivers/media/video/*.h \
-		${hdrdest}/drivers/media/video
-	for i in $(find ${hdrdest}/drivers/media/video/ -mindepth 1 -type d); do
-		_dir=$(basename $i)
-		mkdir -p ${hdrdest}/drivers/media/video/${_dir}
-		cp -a drivers/media/video/${_dir}/*.h \
-			${hdrdest}/drivers/media/video/${_dir}
-	done
-
 	# Add docbook makefile
 	install -D -m644 Documentation/DocBook/Makefile \
 		${hdrdest}/Documentation/DocBook/Makefile
@@ -162,35 +151,6 @@ do_install() {
 	mkdir -p ${hdrdest}/net/mac80211/
 	cp net/mac80211/*.h ${hdrdest}/net/mac80211
 
-	# Add dvb headers for external modules in reference to:
-	# http://bugs.archlinux.org/task/9912
-	mkdir -p ${hdrdest}/drivers/media/dvb/dvb-core
-	cp drivers/media/dvb/dvb-core/*.h \
-		${hdrdest}/drivers/media/dvb/dvb-core
-
-	# Add dvb headers for external modules in reference to:
-	# http://bugs.archlinux.org/task/11194
-	mkdir -p ${hdrdest}/include/config/dvb
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb
-
-	# Add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	# in reference to:
-	# http://bugs.archlinux.org/task/13146
-	mkdir -p ${hdrdest}/drivers/media/dvb/frontends
-	cp drivers/media/dvb/frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb/frontends
-	cp drivers/media/video/msp3400-driver.h \
-		${hdrdest}/drivers/media/dvb/frontends
-
-	# Add dvb headers in reference to:
-	# http://bugs.archlinux.org/task/20402
-	mkdir -p ${hdrdest}/drivers/media/dvb/dvb-usb
-	cp drivers/media/dvb/dvb-usb/*.h ${hdrdest}/drivers/media/dvb/dvb-usb
-	mkdir -p ${hdrdest}/drivers/media/dvb/frontends
-	cp drivers/media/dvb/frontends/*.h ${hdrdest}/drivers/media/dvb/frontends
-	mkdir -p ${hdrdest}/drivers/media/common/tuners
-	cp drivers/media/common/tuners/*.h ${hdrdest}/drivers/media/common/tuners
-
 	# Add xfs and shmem for aufs building
 	mkdir -p ${hdrdest}/fs/xfs
 	mkdir -p ${hdrdest}/mm