diff --git a/ChangeLog b/ChangeLog
index a7f6ce738..0ea09a0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/getroot.c (grub_guess_root_device): Don't accept
+	/dev/root as a valid device.
+
 2011-06-23  Jim Meyering  <meyering@redhat.com>
 
-	avoid NULL deref in grub_device_open
+	Avoid NULL deref in grub_device_open.
+
 	* grub-core/kern/device.c (grub_device_open): Don't dereference
 	a NULL pointer upon failed grub_env_get.
 
diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index 6e49cc31b..db27abf74 100644
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -616,13 +616,15 @@ grub_guess_root_device (const char *dir)
 
   if (os_dev)
     {
-      if (strncmp (os_dev, "/dev/dm-", sizeof ("/dev/dm-") - 1) != 0)
+      int dm = (strncmp (os_dev, "/dev/dm-", sizeof ("/dev/dm-") - 1) == 0);
+      int root = (strcmp (os_dev, "/dev/root") == 0);
+      if (!dm && !root)
 	return os_dev;
       if (stat (os_dev, &st) < 0)
 	grub_util_error ("cannot stat `%s'", os_dev);
       free (os_dev);
       dev = st.st_rdev;
-      return grub_find_device ("/dev/mapper", dev);
+      return grub_find_device (dm ? "/dev/mapper" : "/dev", dev);
     }
 
   if (stat (dir, &st) < 0)