diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
index 37892bff60..623a6f2440 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
@@ -93,3 +93,6 @@ net-fs/nfs-utils ~arm64
 # required by sys-block/open-iscsi-2.0.873-r1::coreos
 =sys-fs/lsscsi-0.28 **
 
+# gnu-efi-3.0.3 has arm64 support
+=sys-boot/gnu-efi-3.0.3 **
+
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-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-0.8_p20150423-r1.ebuild
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
index 4c66a4b93d..5e785947dd 100644
--- 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
@@ -6,13 +6,13 @@ CROS_WORKON_PROJECT="coreos/shim"
 CROS_WORKON_REPO="git://github.com"
 
 if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 else
 	CROS_WORKON_COMMIT="03a1513b0985fd682b13a8d29fe3f1314a704c66"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
-inherit cros-workon
+inherit cros-workon multilib
 
 DESCRIPTION="UEFI Shim loader"
 HOMEPAGE="https://github.com/rhinstaller/shim"
@@ -30,7 +30,11 @@ src_unpack() {
 }
 
 src_compile() {
-	make EFI_PATH=/usr/lib shim.efi
+	emake \
+		CROSS_COMPILE="${CHOST}-" \
+		EFI_INCLUDE="${ROOT}"usr/include/efi \
+		EFI_PATH="${ROOT}"usr/$(get_libdir) \
+		shim.efi || die
 }
 
 src_install() {