diff --git a/ChangeLog b/ChangeLog
index cd53ca445..a51619eef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.util.def (libgrub.a): Move grub-core/kern/emu/hostfs.c
+	and grub-core/disk/host.c to ...
+	(grub-fstest): ... here.  Having the host disk implementation
+	present confuses grub-probe and other utility programs.
+
+	* util/grub-mkconfig.in: Only verify readability of grub.cfg.new
+	when writing to a file, not when writing to stdout.
+
 2010-09-09  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* tests/partmap_test.in: New test for partitions.
diff --git a/Makefile.util.def b/Makefile.util.def
index b9901ad66..5ef33c5db 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -23,7 +23,6 @@ library = {
   common = grub-core/kern/misc.c;
   common = grub-core/kern/emu/mm.c;
   common = grub-core/kern/emu/misc.c;
-  common = grub-core/kern/emu/hostfs.c;
   common = grub-core/kern/emu/getroot.c;
   common = grub-core/kern/emu/hostdisk.c;
 
@@ -31,7 +30,6 @@ library = {
   common = grub-core/commands/extcmd.c;
   common = grub-core/commands/ls.c;
   common = grub-core/disk/dmraid_nvidia.c;
-  common = grub-core/disk/host.c;
   common = grub-core/disk/loopback.c;
   common = grub-core/disk/lvm.c;
   common = grub-core/disk/mdraid_linux.c;
@@ -182,6 +180,8 @@ program = {
   name = grub-fstest;
   mansection = 1;
   common = util/grub-fstest.c;
+  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/disk/host.c;
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f0f134b3d..fa84c63d1 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -304,9 +304,11 @@ for i in ${grub_mkconfig_dir}/* ; do
 done
 
 # Verify readability of ${grub_cfg}.new
-if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
-  echo "GRUB is unable to read ${grubdir}/${file}" >&2
-  exit 1   
+if test "x${grub_cfg}" != "x"; then
+  if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
+    echo "GRUB is unable to read ${grubdir}/${file}" >&2
+    exit 1   
+  fi
 fi
 
 if test "x${grub_cfg}" != "x" ; then