diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index ddbcf17f507..783c224a578 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -4,8 +4,6 @@ pkgname=kernel
 version=3.7.1
 revision=1
 wrksrc="linux-${version}"
-depends="dracut linux-firmware kmod>=11_2"
-makedepends="perl kmod>=11_2 openssl"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
@@ -21,6 +19,9 @@ preserve=yes
 subpackages="kernel-headers"
 triggers="kernel-hooks"
 
+depends="dracut linux-firmware kmod>=11_2"
+makedepends="perl kmod>=11_2 openssl which elfutils"
+
 _kernver="${version}_${revision}"
 
 # These files could be modified when an external module is built.
@@ -129,19 +130,27 @@ 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}
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc sn9c102; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
 	done
 
 	# Add docbook makefile
-	install -D -m644 Documentation/DocBook/Makefile \
+	install -Dm644 Documentation/DocBook/Makefile \
 		${hdrdest}/Documentation/DocBook/Makefile
 
 	# Add md headers
@@ -156,48 +165,31 @@ 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
+	mkdir -p ${hdrdest}/drivers/media/dvb-core
+	cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
+	mkdir -p ${hdrdest}include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
 
-	# 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
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
 
-	# 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 dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/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/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
 
 	# Add xfs and shmem for aufs building
 	mkdir -p ${hdrdest}/fs/xfs
 	mkdir -p ${hdrdest}/mm
 	cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
 
-	# Add headers vor virtualbox in reference to:
-	# http://bugs.archlinux.org/task/14568
-	cp -a include/drm ${hdrdest}/include
-
-	# Add headers for broadcom wl in reference to:
-	# http://bugs.archlinux.org/task/14568
-	cp -a include/trace ${hdrdest}/include
-
 	# Copy in Kconfig files
 	for i in $(find . -name "Kconfig*"); do
 		mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
@@ -215,5 +207,5 @@ do_install() {
 	find ${DESTDIR} -name '*.ko' -exec xz -9 {} \;
 
 	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr ${_kernver}
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }