diff --git a/ChangeLog b/ChangeLog
index 95376ee36..a78bb0961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-12  Robert Millan  <rmh@aybabtu.com>
+
+	* util/getroot.c (grub_guess_root_device): Inspect /dev/evms before
+	/dev (like it is done for /dev/mapper).  This doesn't provide support
+	for EVMS, but at least it is now easy to identify the problem when it
+	arises.
+
 2008-02-11  Robert Millan  <rmh@aybabtu.com>
 
 	* util/biosdisk.c (grub_util_biosdisk_open, linux_find_partition)
diff --git a/util/getroot.c b/util/getroot.c
index 74ee6d667..a591dc81f 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -228,9 +228,14 @@ grub_guess_root_device (const char *dir)
 #ifdef __linux__
   /* We first try to find the device in the /dev/mapper directory.  If
      we don't do this, we get useless device names like /dev/dm-0 for
-     LVM. */
+     LVM.  */
   os_dev = find_root_device ("/dev/mapper", st.st_dev);
-  if (!os_dev)
+
+  /* The same applies to /dev/evms directory (for EVMS volumes).  */
+  if (! os_dev)
+    os_dev = find_root_device ("/dev/evms", st.st_dev);
+
+  if (! os_dev)
 #endif
     {
       /* This might be truly slow, but is there any better way?  */