diff --git a/templates/kernel/i386-dotconfig b/templates/kernel/i386-dotconfig
index a2429f95c8b..f58abbd9cd3 100644
--- a/templates/kernel/i386-dotconfig
+++ b/templates/kernel/i386-dotconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.3
-# Mon Jul 27 15:03:42 2009
+# Linux kernel version: 2.6.30.5
+# Tue Aug 25 14:04:06 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -3727,7 +3727,6 @@ CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
@@ -3868,6 +3867,9 @@ CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
 CONFIG_ECRYPT_FS=m
+CONFIG_UNION_FS=m
+CONFIG_UNION_FS_XATTR=y
+# CONFIG_UNION_FS_DEBUG is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
diff --git a/templates/kernel/template b/templates/kernel/template
index 38d90ef5cc4..d5f2b83e561 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -2,7 +2,10 @@
 pkgname=kernel
 _kernel_ver=2.6.30
 _kernel_patch_ver=5
+revision=1
 version=${_kernel_ver}.${_kernel_patch_ver}
+patch_files="unionfs-2.5.2_for_2.6.30.diff.gz"
+patch_args="-Np1"
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 build_style=gnu_makefile
diff --git a/templates/kernel/unionfs-2.5.2_for_2.6.30.diff.gz b/templates/kernel/unionfs-2.5.2_for_2.6.30.diff.gz
new file mode 100644
index 00000000000..51107b9abf4
Binary files /dev/null and b/templates/kernel/unionfs-2.5.2_for_2.6.30.diff.gz differ