diff -ur a/etc/boot.conf.defaults b/etc/boot.conf.defaults
--- a/etc/boot.conf.defaults	2013-02-02 02:45:02.000000000 +0100
+++ b/etc/boot.conf.defaults	2013-02-10 13:20:35.000000000 +0100
@@ -25,10 +25,10 @@
 }
 
 grub {
-	dir grub
+	dir grub2
 	file grub.cfg
-	grub-probe /sbin/grub-probe
-	grub-mkdevicemap /sbin/grub-mkdevicemap
+	grub-probe /usr/sbin/grub2-probe
+	grub-mkdevicemap /usr/sbin/grub2-mkdevicemap
 	font_src /usr/share/grub/fonts
 }
 
diff -ur a/python/modules/funtoo/boot/extensions/grub.py b/python/modules/funtoo/boot/extensions/grub.py
--- a/python/modules/funtoo/boot/extensions/grub.py	2013-02-02 02:45:02.000000000 +0100
+++ b/python/modules/funtoo/boot/extensions/grub.py	2013-02-10 13:23:34.000000000 +0100
@@ -28,9 +28,7 @@
 		self.defname = "undefined"
 
 	def grubProbe(self):
-		gprobe = "/usr/sbin/grub-probe"
-		if not os.path.exists(gprobe):
-			gprobe = "/sbin/grub-probe"
+		gprobe = self.config["grub/grub-probe"]
 		if not os.path.exists(gprobe):
 			raise ExtensionError("couldn't find grub-probe")
 		return gprobe
@@ -303,5 +301,5 @@
 		l.append("  set root={dev}".format(dev = grubdev))
 		retval, uuid = self.DeviceUUID(dev)
 		if retval == 0:
-			l.append("  search --no-floppy --fs-uuid --set {u}".format(u = uuid ))
+			l.append("  search --no-floppy --fs-uuid --set=root {u}".format(u = uuid ))
 		# TODO: add error handling for retvals