diff --git a/TODO b/TODO
index 548f9382fb..1bda18045f 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,5 @@
 * Add support to stop and restart package's OpenRC service while
   removing and upgrading a package.
   [PARTIAL: at pre-remove the services are stopped but not yet restarted]
-* How to handle kernel package upgrades? dpkg seems to keep previous
-  package and its initramfs, and a dummy package depends on the latest one.
-  I think this is the best option.
 * Fix HAL/PolicyKit for nonroot to be able to admin tasks.
 * Fix loadkeys(1) incorrectly loading the olpc keymap vs qwerty.
diff --git a/templates/kernel/i386-dotconfig b/templates/kernel/i386-dotconfig
index f58abbd9cd..3292d01a04 100644
--- a/templates/kernel/i386-dotconfig
+++ b/templates/kernel/i386-dotconfig
@@ -65,9 +65,9 @@ CONFIG_LOCALVERSION=""
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
diff --git a/templates/kernel/template b/templates/kernel/template
index d5f2b83e56..98c41803f0 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -1,8 +1,8 @@
 # Template file for 'kernel'
 pkgname=kernel
 _kernel_ver=2.6.30
-_kernel_patch_ver=5
-revision=1
+_kernel_patch_ver=6
+#revision=1
 version=${_kernel_ver}.${_kernel_patch_ver}
 patch_files="unionfs-2.5.2_for_2.6.30.diff.gz"
 patch_args="-Np1"
@@ -14,13 +14,14 @@ make_install_target="modules_install
  INSTALL_MOD_PATH=${XBPS_DESTDIR}/${pkgname}-${version}"
 short_desc="The Linux kernel and associated stuff (2.6 branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6fcbc1ea3e0904aebc17330dceee847dac1ccd472502c66ec99f0647b7cbe0cf
+checksum=c111dfbbd3230bfb6b21d3dfcc73da380ca62e1735518fb000313a753f7c1e82
 long_desc="
  This package provides the linux kernel image and the
  kernel modules."
 
 subpackages="firmware"
 triggers="initramfs-tools"
+essential=yes
 
 Add_dependency full glibc
 Add_dependency full dash