diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/Manifest
index 46e810d3b1..684b061769 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/Manifest
@@ -1,3 +1,3 @@
 DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
 DIST grub-2.02~beta2_p20140825.tar.gz 6747194 SHA256 b867af0d7a6ba5848a2d1b24a654303739896e87e96f6a4e8ec6ebcfaa505bbc SHA512 c6a8b72848530c33dea005d045f583ad352b7a59a0af75bc85954441849959c217ed285e9404522ea4c46d9c28e276c2f0d48343e5f6f169eb8eed7135049e54 WHIRLPOOL b6cbca1d3da979fa17d530e7a7de7a9bc0fa32c14e69f8ad217542b248a32dcc1212e604e5784f15663b6b9e5be3933d9cd8c99b183ff2245efa49c2862c3aa2
-DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f
+DIST unifont-7.0.05.pcf.gz 1359030 SHA256 c897bc3796b1c460d13fbed1d6d800027886405efa3715a31275183d3f85ce91 SHA512 d75d810521306e912228e10d7e08749392ade4b9f35199fa43694c57779054f152ba9b30ce6c3b3bd9bb925f60aebbb99f00d3448ed039e748e0353c787d9336 WHIRLPOOL 1af9cb9b6b3a4c46e596228d3231ef160300b0a5545c3e091eaceeb2b522ac1b25721f17f7f2f742a5a1ab92ccedebf4fe2649260284ab208dbd8696fa69594c
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825-r1.ebuild
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825-r1.ebuild
index 3aed5d897d..216230a402 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02_beta2_p20140825-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.8 2014/06/22 18:02:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.21 2014/10/19 01:51:58 floppym Exp $
 
 EAPI=5
 
@@ -38,11 +38,9 @@ else
 fi
 
 DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.0.01
-SRC_URI+=" truetype? (
-	mirror://sourceforge/dejavu/${DEJAVU}.zip
-	mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
-)"
+UNIFONT=unifont-7.0.05
+SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
+	truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
 DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
@@ -56,7 +54,7 @@ GRUB_ALL_PLATFORMS=(
 	# everywhere:
 	emu
 	# mips only:
-	qemu-mips yeeloong
+	qemu-mips loongson
 	# amd64, x86, ppc, ppc64:
 	ieee1275
 	# amd64, x86:
@@ -66,9 +64,6 @@ GRUB_ALL_PLATFORMS=(
 )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
 
-REQUIRED_USE="grub_platforms_qemu? ( truetype )
-	grub_platforms_yeeloong? ( truetype )"
-
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
 RDEPEND="
@@ -80,7 +75,7 @@ RDEPEND="
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	libzfs? ( sys-fs/zfs )
 	mount? ( sys-fs/fuse )
-	truetype? ( media-libs/freetype )
+	truetype? ( media-libs/freetype:2= )
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 "
@@ -91,6 +86,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-apps/help2man
 	sys-apps/texinfo
+	grub_platforms_coreboot? ( media-libs/freetype:2 )
+	grub_platforms_qemu? ( media-libs/freetype:2 )
+	grub_platforms_ieee1275? ( media-libs/freetype:2 )
+	grub_platforms_loongson? ( media-libs/freetype:2 )
 	grub_platforms_xen? ( app-emulation/xen-tools )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
@@ -157,16 +156,21 @@ src_unpack() {
 
 src_prepare() {
 	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+
 	sed -i -e /autoreconf/d autogen.sh || die
+
 	if use multislot; then
 		# fix texinfo file name, bug 416035
 		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
 	fi
+
 	epatch_user
+
 	if [[ -n ${GRUB_AUTOGEN} ]]; then
 		python_setup
 		bash autogen.sh || die
 	fi
+
 	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
 		autopoint() { return 0; }
 		eautoreconf
@@ -174,8 +178,10 @@ src_prepare() {
 }
 
 setup_fonts() {
-	ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
 	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	if use truetype; then
+		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
 }
 
 grub_configure() {
@@ -222,10 +228,8 @@ grub_configure() {
 		myeconfargs+=( --program-transform-name="s,grub,grub2," )
 	fi
 
-	if use truetype; then
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir setup_fonts
-	fi
+	mkdir -p "${BUILD_DIR}" || die
+	run_in_build_dir setup_fonts
 
 	autotools-utils_src_configure
 }