diff -r 323ae92f774b config/MiniOS.mk
--- a/config/MiniOS.mk	Wed Jul 15 09:14:19 2009 +0100
+++ b/config/MiniOS.mk	Wed Jul 15 11:35:03 2009 +0200
@@ -1,4 +1,4 @@
-include $(XEN_ROOT)/config/StdGNU.mk
+include $(XEN_ROOT)/config/$(shell uname -s).mk
 include $(XEN_ROOT)/extras/mini-os/Config.mk
 CFLAGS += $(DEF_CFLAGS) $(ARCH_CFLAGS)
 CPPFLAGS += $(DEF_CPPFLAGS) $(ARCH_CPPFLAGS) $(extra_incl)
diff -r 323ae92f774b tools/Rules.mk
--- a/tools/Rules.mk	Wed Jul 15 09:14:19 2009 +0100
+++ b/tools/Rules.mk	Wed Jul 15 11:35:03 2009 +0200
@@ -33,7 +33,10 @@ CFLAGS += -D__XEN_TOOLS__
 CFLAGS += -MMD -MF .$(@F).d
 DEPS = .*.d
 
-ifneq ($(XEN_OS),NetBSD)
+# On NetBSD LFS is always on.
+# We can't use $(XEN_OS) or we will miss MiniOS
+# when we build MiniOS on NetBSD.
+ifneq ($(shell uname -s),NetBSD)
 # Enable implicit LFS support *and* explicit LFS names.
 CFLAGS  += $(shell getconf LFS_CFLAGS)
 CFLAGS  += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE