diff --git a/ChangeLog b/ChangeLog
index de168a73a..9c413e471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Richard Laager <rlaager@wiktel.com>
+
+	* util/getroot.c (grub_find_root_devices_from_mountinfo): Handle
+	"zfs" and "fuse.zfs" as synonyms.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Put platform and target_cpu substitutions back since
diff --git a/util/getroot.c b/util/getroot.c
index 2c101b8ba..e87f42963 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -601,7 +601,8 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
       if (!*entries[i].device)
 	continue;
 
-      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0)
+      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0
+	  || grub_strcmp (entries[i].fstype, "zfs") == 0)
 	{
 	  char *slash;
 	  slash = strchr (entries[i].device, '/');