diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass
index 8f30034ac7..4d73118bbc 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass
@@ -29,13 +29,11 @@ STRIP_MASK="/usr/lib/debug/boot/vmlinux"
 #   %ROOT% => ${ROOT}
 
 CONFIG_FRAGMENTS=(
+	aufs
 	blkdevram
-	ca0132
 	cifs
 	debug
 	fbconsole
-	gdmwimax
-	gobi
 	highmem
 	i2cdev
 	initramfs
@@ -43,15 +41,16 @@ CONFIG_FRAGMENTS=(
 	netboot_ramfs
 	nfs
 	pcserial
-	qmi
-	realtekpstor
-	samsung_serial
 	systemtap
 	tpm
 	vfat
-	x32
 )
 
+aufs_desc="aufs3"
+aufs_config="
+CONFIG_AUFS_FS=y
+"
+
 blkdevram_desc="ram block device"
 blkdevram_config="
 CONFIG_BLK_DEV_RAM=y
@@ -59,12 +58,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 "
 
-ca0132_desc="CA0132 ALSA codec"
-ca0132_config="
-CONFIG_SND_HDA_CODEC_CA0132=y
-CONFIG_SND_HDA_DSP_LOADER=y
-"
-
 cifs_desc="Samba/CIFS Support"
 cifs_config="
 CONFIG_CIFS=m
@@ -87,11 +80,6 @@ CONFIG_WIMAX_GDM72XX_USB=y
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 "
 
-gobi_desc="Qualcomm Gobi modem driver"
-gobi_config="
-CONFIG_USB_NET_GOBI=m
-"
-
 highmem_desc="highmem"
 highmem_config="
 CONFIG_HIGHMEM64G=y
@@ -183,41 +171,23 @@ CONFIG_PARPORT_PC=y
 CONFIG_PARPORT_SERIAL=y
 "
 
-qmi_desc="QMI WWAN driver"
-qmi_config="
-CONFIG_USB_NET_QMI_WWAN=m
-"
-
-samsung_serial_desc="Samsung serialport"
-samsung_serial_config="
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-"
-
-realtekpstor_desc="Realtek PCI card reader"
-realtekpstor_config="
-CONFIG_RTS_PSTOR=m
-"
-
 systemtap_desc="systemtap support"
 systemtap_config="
 CONFIG_KPROBES=y
 CONFIG_DEBUG_INFO=y
 "
 
-x32_desc="x32 ABI support"
-x32_config="
-CONFIG_X86_X32=y
-"
-
 # Add all config fragments as off by default
 IUSE="${IUSE} ${CONFIG_FRAGMENTS[@]}"
+
+# CoreOS always wants aufs... for now
+IUSE="${IUSE} +aufs"
+
 REQUIRED_USE="
 	initramfs? ( !netboot_ramfs )
 	netboot_ramfs? ( !initramfs )
 	initramfs? ( i2cdev tpm )
 	netboot_ramfs? ( i2cdev tpm )
-	x32? ( amd64 )
 "
 
 # If an overlay has eclass overrides, but doesn't actually override this
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r1.ebuild
new file mode 100644
index 0000000000..bdf1af9630
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $
+
+EAPI=4
+CROS_WORKON_COMMIT="04166fbfff4a30f52f387562a288d1583ad59be4"
+CROS_WORKON_TREE="04166fbfff4a30f52f387562a288d1583ad59be4"
+CROS_WORKON_REPO="git://github.com"
+CROS_WORKON_PROJECT="coreos/linux"
+inherit cros-workon cros-kernel2
+
+DESCRIPTION="CoreOS kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="amd64 arm x86"
+IUSE="deblob"