diff --git a/ChangeLog b/ChangeLog
index bdeb62500..fe368aa57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/misc.c
+	(grub_make_system_path_relative_to_its_root)
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Fix mountpoint return on ZFS.
+
+2010-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/misc.c
 	(grub_make_system_path_relative_to_its_root): Revert r2882.
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index d8db3be9d..c8b95443b 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -416,6 +416,10 @@ grub_make_system_path_relative_to_its_root (const char *path)
 	    {
 	      free (buf);
 	      free (buf2);
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+	      if (poolfs)
+		return xasprintf ("/%s/@", poolfs);
+#endif
 	      return xstrdup ("");
 	    }
 	  else