diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index fce0f511..aca5527b 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -212,7 +212,7 @@ removefrom gnome-themes /usr/share/themes/Mist/* /usr/share/themes/Simple/*
 removefrom gnutls /usr/share/locale/*
 removefrom gpgme /usr/${libdir}/libgpgme-*
 removefrom grep /etc/* /usr/share/locale/*
-removefrom grub /sbin/grub-* /usr/bin/*
+removefrom grub2 /sbin/* /usr/bin/*
 removefrom gstreamer /usr/bin/* /usr/${libdir}/gstreamer-0.10/*
 removefrom gstreamer /usr/${libdir}/libgst* /usr/libexec/* /usr/share/locale/*
 removefrom gtk2 /usr/bin/update-gtk-immodules
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index ef905f42..f1689ac0 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -20,7 +20,7 @@ installpkg kernel
     installpkg kernel-PAE gpart
 %endif
 %if basearch in ("i386", "x86_64"):
-    installpkg grub grub-efi firstaidkit-plugin-grub efibootmgr biosdevname memtest86+
+    installpkg grub2 grub2-efi efibootmgr biosdevname memtest86+
 %endif
 %if basearch in ("ppc", "ppc64"):
     installpkg yaboot fbset hfsutils kernel-bootwrapper ppc64-utils