diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r16.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r15.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r16.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
index 85d3857843..7610ee497e 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	sys-apps/debianutils
 	sys-apps/iproute2
 	sys-boot/grub
+	sys-boot/shim
 	sys-devel/crossdev
 	sys-firmware/edk2-ovmf
 	sys-fs/btrfs-progs
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423.ebuild
new file mode 120000
index 0000000000..ac0bdc5b80
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423.ebuild
@@ -0,0 +1 @@
+shim-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
new file mode 100644
index 0000000000..4c66a4b93d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2015 CoreOS, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/shim"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64"
+else
+	CROS_WORKON_COMMIT="03a1513b0985fd682b13a8d29fe3f1314a704c66"
+	KEYWORDS="amd64"
+fi
+
+inherit cros-workon
+
+DESCRIPTION="UEFI Shim loader"
+HOMEPAGE="https://github.com/rhinstaller/shim"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-boot/gnu-efi dev-libs/openssl"
+
+src_unpack() {
+	cros-workon_src_unpack
+	default_src_unpack
+}
+
+src_compile() {
+	make EFI_PATH=/usr/lib shim.efi
+}
+
+src_install() {
+	insinto /usr/lib/shim
+	doins "shim.efi"
+}