diff --git a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
index 87d1c42f442..948d6eb18b2 100644
--- a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
+++ b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
@@ -1,16 +1,13 @@
 # Template file for 'kernel-snapshot-headers'.
 #
+nostrip=yes
+noverifyrdeps=yes
 short_desc="${pkgname} src headers"
 long_desc="
  This package contains the required source headers to be able to build
  external 3rd party binary modules."
 
-nostrip=yes
-noverifyrdeps=yes
-
 do_install() {
-	mkdir -p ${DESTDIR}/lib/modules/${_kernver}
-	mv ${SRCPKGDESTDIR}/usr ${DESTDIR}
-	mv ${SRCPKGDESTDIR}/lib/modules/${_kernver}/build \
-		${DESTDIR}/lib/modules/${_kernver}
+	vmove usr
+	vmove lib/modules/${_kernver}/build lib/modules/${_kernver}
 }
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 50f4d3b1b5e..bb38000f557 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -11,8 +11,12 @@ distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
-depends="glibc initramfs-tools linux-firmware module-init-tools"
-makedepends="perl>=0 kmod"
+depends="dracut linux-firmware module-init-tools"
+makedepends="perl kmod"
+nostrip=yes
+noverifyrdeps=yes
+preserve=yes
+patch_args="-Np1"
 short_desc="The Linux kernel and modules (testing snapshot)"
 long_desc="
  This package provides the linux kernel image and associated modules
@@ -21,11 +25,7 @@ checksum=8b173eba3f400b15f3172131ced52169867ba5eab6cc0810aab89c220153ed78
 subpackages="kernel-snapshot-headers"
 triggers="kernel-hooks"
 
-nostrip=yes
-noverifyrdeps=yes
-preserve=yes
-patch_args="-Np1"
-#revision=1
+revision=1
 if [ -n "$revision" ]; then
 	_kernver="${_kmajor}.${_kminor}-${_kpatch}_${revision}"
 else
@@ -42,7 +42,6 @@ mutable_files="
 /lib/modules/${_kernver}/modules.alias
 /lib/modules/${_kernver}/modules.alias.bin"
 
-
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff