diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README
new file mode 100644
index 0000000000..c5bb84d058
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/README
@@ -0,0 +1,44 @@
+The kernel tree is managed in git and is essentially the stable kernel + aufs.
+
+To bump to a new version do the following:
+
+1) Setup a checkout of github.com/coreos/linux
+
+2) Edit the .git/config to look like this:
+
+```
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[remote "origin"]
+	url = git@github.com:coreos/linux.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[remote "linus"]
+	url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+	fetch = +refs/heads/*:refs/remotes/linus/*
+[remote "stable"]
+	url = https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable
+	fetch = +refs/heads/*:refs/remotes/stable/*
+[remote "aufs"]
+	url = http://git.code.sf.net/p/aufs/aufs3-linux
+	fetch = +refs/heads/*:refs/remotes/aufs/*
+```
+
+3) git fetch --all
+
+3) git checkout -b 'coreos/v3.8.8'
+
+4) git reset --hard v3.8.8
+
+5) git pull . aufs/aufs-3.8
+
+6) git push origin coreos/v3.8.8
+
+7) git checkout coreos/master && git reset --hard coreos/v3.8.8 && git push -f origin coreos/master
+
+Then you can bump the hash in the ebuild and move it to the new version here.
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4.ebuild
deleted file mode 100644
index c3c721ad92..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="405acc3402a3df8df967d1848947dc58f0059664"
-CROS_WORKON_TREE="405acc3402a3df8df967d1848947dc58f0059664"
-CROS_WORKON_REPO="https://kernel.googlesource.com/pub/scm/linux/kernel/git/"
-CROS_WORKON_PROJECT="stable/linux-stable"
-inherit cros-workon cros-kernel2
-
-DESCRIPTION="CoreOS kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="amd64 arm x86"
-IUSE="deblob"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.8.ebuild
similarity index 79%
rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.8.ebuild
index bdf1af9630..27324cb901 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.4-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.8.ebuild
@@ -3,8 +3,8 @@
 # $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_COMMIT="0ff44b050e7f57e7d3743a44af2c9211da30bdb4"
+CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4"
 CROS_WORKON_REPO="git://github.com"
 CROS_WORKON_PROJECT="coreos/linux"
 inherit cros-workon cros-kernel2
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.ebuild
deleted file mode 100644
index 11c194e9d4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="19f949f52599ba7c3f67a5897ac6be14bfcb1200"
-CROS_WORKON_TREE="19f949f52599ba7c3f67a5897ac6be14bfcb1200"
-CROS_WORKON_REPO="https://kernel.googlesource.com/pub/scm/linux/kernel/git/"
-CROS_WORKON_PROJECT="torvalds/linux"
-inherit cros-workon cros-kernel2
-
-DESCRIPTION="CoreOS kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="amd64 arm x86"
-IUSE="deblob"