diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 75198c15d..1c2d903b2 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,6 @@
 AUX 00_fonts 462 RMD160 828b03d1201aa8b8abe339305ff4e2a8b99d1d33 SHA1 fcdaf4ac95ca318750c33153be993dac0e9c8c99 SHA256 fbe13c4e5373835fb529c6c9454ac07a3e523bd56529483d0ec86f9583ae8fed
 AUX 05_distro_theme 1180 RMD160 ee8d8707e07dbf9877be5bbc9322263822d4ddad SHA1 ad9fb101b7f959ca2392d404a86bec299f326c88 SHA256 cff76aaf874da7270265eca015ffada92f30609699f8cc956a4df0c480a9a5fc
+AUX default-splash-5.4.png 641815 RMD160 175bf793a542654e765fecca89f6c628e7a8a586 SHA1 a8ceabcef3854517d879522ab5155540ddeca3d9 SHA256 f9eedc888fd11d899000397f073d042ce5a4230923966f9d12828263f0a2d14a
 AUX default-splash.png 379111 RMD160 c399047d7d63e72495416f0f25cdc4c7bcc38946 SHA1 d0e6e920e4ce973c460d4bb994e4a87e2e32e8aa SHA256 09de78447d236669252b4669a341b5589043466bcb6bbf80e334462024c655c8
 AUX grub-0.97-gfxmenu-v8.patch 23313 RMD160 ee79292a61a4fcbfa2afe5bea56e56ee4efbfe01 SHA1 b4e567009e61e9bc6a2e60bae3333681c458debc SHA256 c2f7897027842631a95a654e7978d43e6d21d8c06426ff2d966678e3fca0ba4a
 AUX grub-0.97-uuid.patch 144339 RMD160 58816e0fc819a0c5afc2da0024611ec650119be2 SHA1 9b5a0fb112eaf143b8b81f487b3b515a13423372 SHA256 9766e446665a955e2dab10e5e42d83b3384b5e6e306c3eba70a08f35a3fbf129
@@ -42,4 +43,5 @@ EBUILD grub-0.97-r22.ebuild 7588 RMD160 86e8c77ec7ee193919bdec359e53a8236a4b4c77
 EBUILD grub-1.97.2-r1.ebuild 3312 RMD160 a10bd2331fe83c1f8b49c798aaa996841c5a3111 SHA1 f46e0f832278a8aeecca3173869e5830697cbd6e SHA256 10d3bf7a3d1984b8c8110bf13850bbd78fbe45613a87b5dd992d83c0194b4d04
 EBUILD grub-1.97.2-r2.ebuild 3390 RMD160 967a603873ce2b44d8d49988fa5228a0452a4c77 SHA1 3b193ac4de7b0e068596dd87ab6993ce1d23ee2d SHA256 53c829aa3a3c3dbddb51d7196294032b9bbdf28a1f5487be31ec02bf44a5b53d
 EBUILD grub-1.98-r7.ebuild 3755 RMD160 7a5660b9798c7ca8e7d4d716070f2c8138760cc8 SHA1 88887eba24afdfadbdd8c74f261b41a7726af11c SHA256 3e66998a8456ad3a2439490222fc800ae0fcfc62e9a58bbecb8bac05fef7c5c8
+EBUILD grub-1.98-r8.ebuild 3803 RMD160 798bba56975817bdc5e49920a6da0d488e359f0e SHA1 e476c50da9a1bf605b477d4469d2fbde68541878 SHA256 de2fc2f9b919bd2bd2cc1f05291456fe1a2f42823f281140ccde496716636c5a
 MISC Reasons 409 RMD160 e37a7f6a55b49413e5117ca109817b117f2eec32 SHA1 51e37594519f876a63927eff47607a2adf1328af SHA256 4315876ecd099b96a83ecb4acd739d4d331a69c16dc1dc54a2028e73d80000d0
diff --git a/sys-boot/grub/files/default-splash-5.4.png b/sys-boot/grub/files/default-splash-5.4.png
new file mode 100644
index 000000000..219788731
Binary files /dev/null and b/sys-boot/grub/files/default-splash-5.4.png differ
diff --git a/sys-boot/grub/grub-1.98-r8.ebuild b/sys-boot/grub/grub-1.98-r8.ebuild
new file mode 100644
index 000000000..2f6ac05b5
--- /dev/null
+++ b/sys-boot/grub/grub-1.98-r8.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.1 2010/03/10 19:47:34 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub"
+	inherit autotools bzr
+	SRC_URI=""
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GRUB 2 boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+use multislot && SLOT="2" || SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags debug truetype multislot static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo
+	truetype? (
+		media-libs/freetype
+		media-fonts/unifont
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/ruby"
+PDEPEND="${PDEPEND}
+	sys-boot/os-prober"
+PROVIDE="virtual/bootloader"
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		bzr_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.98-genkernel.patch
+	epatch "${FILESDIR}"/${PN}-1.97-vga-deprecated.patch
+	epatch "${FILESDIR}"/${PN}-1.98-wallpaper-settings-support.patch
+	# see Gentoo #302634
+	epatch "${FILESDIR}"/${PN}-1.98-add-legacy-rootfs-detection.patch
+
+	# Ubuntu and upstream patches
+	epatch "${FILESDIR}"/ubuntu-upstream-${PV}/*.diff
+
+	epatch_user
+
+	# see Gentoo #321569
+	epatch "${FILESDIR}"/${PN}-1.98-follow-dev-mapper-symlinks.patch
+
+	# Genkernel doesn't support "single" for rescue mode
+	# but rather init_opts=single
+	epatch "${FILESDIR}"/${PN}-1.98-genkernel-initramfs-single.patch
+
+	# autogen.sh does more than just run autotools
+	# need to eautomake due to weirdness #296013
+	if [[ ${PV} == "9999" ]] ; then
+		sed -i \
+			-e '/^\(auto\|ac\)/s:^:e:' \
+			-e "s:^eautomake:`which automake`:" \
+			autogen.sh
+		(. ./autogen.sh) || die
+	fi
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	econf \
+		--disable-werror \
+		--sbindir=/sbin \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--disable-efiemu \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable debug grub-fstest)
+	emake -j1 || die "making regular stuff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	if use multislot ; then
+		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
+		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/sbin/grub{,2}-set-default || die
+		mv "${D}"/usr/share/info/grub{,2}.info || die
+	fi
+
+	# install /etc/default/grub
+	cp "${FILESDIR}/grub2-default" grub
+	dodir /etc/default
+	insinto /etc/default
+	doins grub
+
+	# Install fonts setup hook
+	exeinto /etc/grub.d
+	doexe "${FILESDIR}/00_fonts"
+	doexe "${FILESDIR}/05_distro_theme"
+
+	dodir /boot/grub
+	insinto /boot/grub
+	newins "${FILESDIR}/default-splash-5.4.png" default-splash.png
+	# keep backward compat
+	dodir /usr/share/grub
+	insinto /usr/share/grub
+	newins "${FILESDIR}/default-splash-5.4.png" default-splash.png
+
+}
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}/grub
+
+	if [[ ! -e ${dir}/grub.cfg ]] ; then
+		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+		grub-mkconfig -o "${dir}/grub.cfg"
+	fi
+
+	#local install=grub-install
+	#use multislot && install="grub2-install --grub-setup=/bin/true"
+	#einfo "Running: ${install} "
+	#${install}
+}
+
+pkg_postinst() {
+	if use multislot ; then
+		elog "You have installed grub2 with USE=multislot, so to coexist"
+		elog "with grub1, the grub2 install binary is named grub2-install."
+	fi
+	setup_boot_dir "${ROOT}"boot
+}