diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig
index 2c66b671a8f..6bb502ad3c6 100644
--- a/srcpkgs/kernel/files/i386-dotconfig
+++ b/srcpkgs/kernel/files/i386-dotconfig
@@ -5115,9 +5115,6 @@ CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=m
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig
index 4ee76554bda..32ad775f908 100644
--- a/srcpkgs/kernel/files/x86_64-dotconfig
+++ b/srcpkgs/kernel/files/x86_64-dotconfig
@@ -5051,9 +5051,6 @@ CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=m
-CONFIG_UNION_FS=m
-CONFIG_UNION_FS_XATTR=y
-# CONFIG_UNION_FS_DEBUG is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set
diff --git a/srcpkgs/kernel/kernel-headers.template b/srcpkgs/kernel/kernel-headers.template
index 1ba2103dd86..46d0f12faef 100644
--- a/srcpkgs/kernel/kernel-headers.template
+++ b/srcpkgs/kernel/kernel-headers.template
@@ -1,17 +1,14 @@
 # Template file for 'kernel-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/patches/i915-fix-ghost-tv-output.patch b/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch
index 357fa6cbb8b..3cd1d4c6a33 100644
--- a/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch
+++ b/srcpkgs/kernel/patches/i915-fix-ghost-tv-output.patch
@@ -6,8 +6,8 @@ Tested-by: Santi <santi@agolina.net>
 
 diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
 index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
+--- drivers/gpu/drm/i915/intel_tv.c
++++ drivers/gpu/drm/i915/intel_tv.c
 @@ -1267,6 +1267,15 @@
 		   DAC_B_0_7_V |
 		   DAC_C_0_7_V);
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.11_for_3.3.0-rc3.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.11_for_3.3.0-rc3.diff.gz
deleted file mode 100644
index a3ad5fdeced..00000000000
Binary files a/srcpkgs/kernel/patches/unionfs-2.5.11_for_3.3.0-rc3.diff.gz and /dev/null differ
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index f359f3dd1d6..4020dda2f4b 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -3,27 +3,25 @@
 pkgname=kernel
 _kmajorver=3.3
 version=${_kmajorver}.7
-wrksrc="linux-${version}"
-distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
-checksum=7a93d6c032826b1cad40fdf339596f1d86abd1d5d30b78c9eed5e5136a1f82ab
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.kernel.org"
-license="GPL-2"
-depends="initramfs-tools linux-firmware module-init-tools"
-makedepends="perl kmod"
-short_desc="The Linux kernel and modules"
-long_desc="
- This package provides the linux kernel image and associated modules."
-subpackages="kernel-headers"
-triggers="kernel-hooks"
-
 build_requires=16
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes
-patch_args="-Np1"
+wrksrc="linux-${version}"
+depends="dracut linux-firmware module-init-tools"
+makedepends="perl kmod"
+subpackages="kernel-headers"
+triggers="kernel-hooks"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.kernel.org"
+license="GPL-2"
+short_desc="The Linux kernel and modules"
+long_desc="
+ This package provides the linux kernel image and associated modules."
+distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
+checksum=7a93d6c032826b1cad40fdf339596f1d86abd1d5d30b78c9eed5e5136a1f82ab
 
-#: ${revision:=1}
+revision=1
 if [ -n "${revision}" ]; then
 	_kernver="${version}_${revision}"
 else
@@ -39,7 +37,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