diff --git a/Makefile.util.def b/Makefile.util.def
index 04b3d6f1c..2ad7f6a57 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -203,12 +203,11 @@ program = {
   name = grub-mkdevicemap;
   installdir = sbin;
   mansection = 8;
-  nosparc64 = util/grub-mkdevicemap.c;
-  nosparc64 = util/deviceiter.c;
+
+  common = util/grub-mkdevicemap.c;
+  common = util/deviceiter.c;
   nosparc64 = util/devicemap.c;
 
-  sparc64_ieee1275 = util/grub-mkdevicemap.c;
-  sparc64_ieee1275 = util/deviceiter.c;
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
@@ -267,24 +266,39 @@ script = {
   installdir = grubconf;
 };
 
-/*
 script = {
   name = '10_windows';
   common = util/grub.d/10_windows.in;
   installdir = grubconf;
+  condition = COND_host_windows;
 };
 
 script = {
   name = '10_hurd';
   common = util/grub.d/10_hurd.in;
   installdir = grubconf;
+  condition = COND_host_hurd;
+};
+
+script = {
+  name = '10_kfreebsd.in';
+  common = util/grub.d/10_kfreebsd.in;
+  installdir = grubconf;
+  condition = COND_host_kfreebsd;
+};
+
+script = {
+  name = '10_netbsd.in';
+  common = util/grub.d/10_netbsd.in;
+  installdir = grubconf;
+  condition = COND_host_netbsd;
 };
-*/
 
 script = {
   name = '10_linux';
   common = util/grub.d/10_linux.in;
   installdir = grubconf;
+  condition = COND_host_linux;
 };
 
 script = {
diff --git a/configure.ac b/configure.ac
index c05b506c7..19ea08c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -873,6 +873,11 @@ AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform =
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_host_hurd], [test x$host_kernel = xhurd])
+AM_CONDITIONAL([COND_host_linux], [test x$host_kernel = xlinux])
+AM_CONDITIONAL([COND_host_netbsd], [test x$host_kernel = xnetbsd])
+AM_CONDITIONAL([COND_host_windows], [test x$host_kernel = xwindows])
+AM_CONDITIONAL([COND_host_kfreebsd], [test x$host_kernel = xkfreebsd])
 
 AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
 AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])