diff --git a/ChangeLog b/ChangeLog
index 2e66e76ab..6aec4618a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-09  Robert Millan  <rmh@aybabtu.com>
+
+	* util/grub-probe.c (main): When `verbosity > 1', set `debug'
+	environment variable to 'all' in order to obtain debug output from
+	non-util/ code.
+	* util/i386/pc/grub-setup.c (main): Likewise.
+
 2008-02-08  Robert Millan  <rmh@aybabtu.com>
 
 	* disk/raid.c (grub_raid_scan_device): Check for
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 062889ca9..a0d38fba4 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -295,6 +295,9 @@ main (int argc, char *argv[])
 	  }
     }
 
+  if (verbosity > 1)
+    grub_env_set ("debug", "all");
+
   /* Obtain PATH.  */
   if (optind >= argc)
     {
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index a101bdbcc..08404eba2 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -653,6 +653,9 @@ main (int argc, char *argv[])
 	  }
     }
 
+  if (verbosity > 1)
+    grub_env_set ("debug", "all");
+
   /* Obtain DEST_DEV.  */
   if (optind >= argc)
     {