diff --git a/ChangeLog b/ChangeLog
index abe698574..20094fec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	Prevent accidental use of uninitialized libzfs_handle.
+
+	* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
+	* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
+	* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/20_linux_xen.in: Don't use UUID for LVM root (matching
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 6caae08e6..f8eda2294 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -289,6 +289,8 @@ find_root_device_from_libzfs (const char *dir)
     nvlist_t **nvlist_array;
     unsigned int nvlist_count;
 
+    grub_util_init_libzfs ();
+
     zpool = zpool_open (libzfs_handle, poolname);
     nvlist = zpool_get_config (zpool, NULL);
 
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 52f2b3747..56cbc5592 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -359,7 +359,6 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
 
   grub_util_init_nls ();
-  grub_util_init_libzfs ();
 
   /* Check for options.  */
   while (1)
diff --git a/util/misc.c b/util/misc.c
index 0859197bf..2eff256bf 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -309,8 +309,11 @@ void
 grub_util_init_libzfs (void)
 {
 #ifdef HAVE_LIBZFS
-  libzfs_handle = libzfs_init ();
-  atexit (fini_libzfs);
+  if (! libzfs_handle)
+    {
+      libzfs_handle = libzfs_init ();
+      atexit (fini_libzfs);
+    }
 #endif
 }
 #endif