diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9a70fc338..3be53a9eb 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -4,5 +4,5 @@ AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 00
 AUX splash.xpm.gz 6251 RMD160 d7b6f187c45597dab59415163fc9d0c154d40cbe SHA1 3b8615b6e105fcbcd6530b46947e06d480caa8f4 SHA256 46397f66ab9dbb2215d5191d94e6ca5aecb53f84ad70cc17aeb319353ba201b2
 DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd44b429eaa SHA1 1d9da2df8bccef9821ebbbc2f5c5353dbd90bf4d SHA256 6b8445c9260803f059031cbe7475a45fee6499fc2dbd911288af6169455c4028
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
-EBUILD grub-0.97-r21.ebuild 8577 RMD160 0de5d51173c791cf042e9b3368634a278d4408dd SHA1 a9f4ba149a77c5b3c9eb025eda4ea8a021a4fbea SHA256 cf06d78993a3693a16484a629335e8c44a0258aa91c066805b3edff88219b24a
+EBUILD grub-0.97-r21.ebuild 7527 RMD160 296fb808b3af6a814d29ee27e91c6eef16030bc9 SHA1 21b4f4bd73853f2462e809f260b807b4885afa78 SHA256 dbfe1a1a78290fd7818e24a3cd7eb4683f48b60b0d827fb9d933003f94cdace6
 MISC Reasons 147 RMD160 f541019802035822d1d28bce4101133b365b9292 SHA1 113832b0ccf45ee4b00a87a7e919345f090dcfbb SHA256 aba2825b30adcb7ba7c892d087c0e32878a0518719e22623df6ecbd6903b6a2d
diff --git a/sys-boot/grub/grub-0.97-r21.ebuild b/sys-boot/grub/grub-0.97-r21.ebuild
index 19a71cdd2..a153502d8 100644
--- a/sys-boot/grub/grub-0.97-r21.ebuild
+++ b/sys-boot/grub/grub-0.97-r21.ebuild
@@ -195,27 +195,6 @@ setup_boot_dir() {
 		ln -snf grub.conf "${dir}"/menu.lst
 	fi
 
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
 	if [[ ! -e ${dir}/grub.conf ]] ; then
 		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
 		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
@@ -223,11 +202,6 @@ setup_boot_dir() {
 		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
 	fi
 
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		grub-set-default --root-directory="${boot_dir}" default
-	fi
 	einfo "Grub has been installed to ${boot_dir} successfully."
 }