diff --git a/README.md b/README.md
index 4640697..c272db6 100644
--- a/README.md
+++ b/README.md
@@ -90,21 +90,24 @@ Current set is WIP.
 * mb_autoexec_safe_cmd
 * mb_autoexec_safe_test
 * mb_msxhub_file
-* mb_msxhub_get_dos1
+* mb_msxhub_getboot_dos1
+* mb_msxhub_getboot_dos2
+* mb_msxhub_getboot_nextor
 * mb_msxhub_get_dos2
 * mb_msxhub_get_nextor
 * mb_msxhub_get_macro80
 * mb_msxhub_get_z80asmuk
-* mb_msxhub_get_popcom
-* mb_msxhub_get_dmphex
-* mb_msxhub_get_baskom
 * mb_msxhub_get_pmarc
 * mb_msxhub_get_lhpack
 * mb_msxhub_get_lhext
 * mb_msxhub_get_gunzip
 * mb_msxhub_get_tunzip
+* mb_msxhub_get_popcom
+* mb_msxhub_get_adir
 * mb_msxhub_get_turbo
+* mb_msxhub_get_baskom
 * mb_msxhub_get_binldr
+* mb_msxhub_get_dmphex
 * mb_msxhub_get_gfxage
 * mb_msxrom_file
 * mb_msxrom_setup
diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk
index 0c2053a..fd9ae0d 100644
--- a/lib/make/mb_msxhub.mk
+++ b/lib/make/mb_msxhub.mk
@@ -17,21 +17,55 @@ endef
 
 
 #
-# Operating System
+# Boot Operating System (minimal)
 #
-define mb_msxhub_get_dos1
+define mb_msxhub_getboot_dos1
 	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
 	$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
 endef
-define mb_msxhub_get_dos2
+define mb_msxhub_getboot_dos2
 	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
 	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
 endef
-define mb_msxhub_get_nextor
+define mb_msxhub_getboot_nextor
 	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
 	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
 endef
-
+#
+# Full Operating Systems
+#
+define mb_msxhub_boot_get_dos2
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/CHKDSK.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/DISKCOPY.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/FIXDISK.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/UNDEL.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XCOPY.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XDIR.COM)
+	$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/KMODE.COM)
+endef
+define mb_msxhub_get_nextor
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DELALL.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DEVINFO.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRIVERS.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRVINFO.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/FASTOUT.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/LOCK.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MAPDRV.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MSXDOS.SYS)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/EMUFILE.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/RALLOC.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/Z80MODE.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NSYSVER.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTORJP.SYS)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXBOOT.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/CONCLUS.COM)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
+	$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTORK.SYS)
+endef
 
 #
 # Compilers
@@ -88,6 +122,9 @@ endef
 #
 # Tools
 #
+define mb_msxhub_get_adir
+	$(call mb_msxhub_file,$(1),ADIR/1.3-1/get/ADIR/adir.com)
+endef
 define mb_msxhub_get_turbo
 	$(call mb_msxhub_file,$(1),TURBO/2.1-1/get/TURBO/turbo.com)
 endef
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index c8442f0..b68e962 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -1,6 +1,7 @@
 
 MB_OPENMSX_PATH_BIN      ?= bin
 MB_OPENMSX_BOOT_TIMEOUT  ?= 25
+MB_OPENMSX_BOOT_OS       ?= nextor
 MB_OPENMSX_MACHINE       ?= Philips_NMS_8250
 MB_OPENMSX_SPEED         ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
 MB_OPENMSX_EXTS          ?=
@@ -70,5 +71,6 @@ define mb_openmsx_dosctl
 	$(if $(wildcard $(1)/reboot.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1)))
 	$(if $(wildcard $(1)/shutdown.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1)))
 	$(if $(wildcard $(1)/z80.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
+	$(if $(wildcard $(1)/COMMAND.COM),,$(if $(wildcard $(1)/COMMAND2.COM),,$(call mb_msxhub_getboot_$(MB_OPENMSX_BOOT_OS),$(1))))
 	$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
 endef
diff --git a/test/ahello-m80/0module.mk b/test/ahello-m80/0module.mk
index 038d6c0..c5cd214 100644
--- a/test/ahello-m80/0module.mk
+++ b/test/ahello-m80/0module.mk
@@ -5,7 +5,6 @@ BUILD_HELP        += \\n\\t* $(TEST_AHELLO_M80)/ahello.com\\n\\t* test-ahello-m8
 $(TEST_AHELLO_M80):
 	$(call mb_mkdir,$(TEST_AHELLO_M80))
 	$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80))
-	$(call mb_msxhub_get_nextor,$(TEST_AHELLO_M80))
 
 $(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
 	$(call mb_unix2dos,$<,$@)
diff --git a/test/ahello-sdcc/0module.mk b/test/ahello-sdcc/0module.mk
index 1ddbcd2..eb63d46 100644
--- a/test/ahello-sdcc/0module.mk
+++ b/test/ahello-sdcc/0module.mk
@@ -4,7 +4,6 @@ BUILD_HELP        += \\n\\t* $(TEST_AHELLO_SDCC)/ahello.com\\n\\t* test-ahello-s
 
 $(TEST_AHELLO_SDCC):
 	$(call mb_mkdir,$(TEST_AHELLO_SDCC))
-	$(call mb_msxhub_get_nextor,$(TEST_AHELLO_SDCC))
 
 $(TEST_AHELLO_SDCC)/%.rel: test/ahello-sdcc/%.asm | $(TEST_AHELLO_SDCC)
 	$(call mb_sdcc_compile_asm,$@,$<)
diff --git a/test/dist-qa-dos1/0module.mk b/test/dist-qa-dos1/0module.mk
index 0b63519..cd152f2 100644
--- a/test/dist-qa-dos1/0module.mk
+++ b/test/dist-qa-dos1/0module.mk
@@ -5,7 +5,7 @@ BUILD_HELP              += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos
 
 $(TEST_DIST_QA_DOS1):
 	$(call mb_mkdir,$(TEST_DIST_QA_DOS1))
-	$(call mb_msxhub_get_dos1,$(TEST_DIST_QA_DOS1))
+	$(call mb_msxhub_getboot_dos1,$(TEST_DIST_QA_DOS1))
 
 $(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)
diff --git a/test/dist-qa-dos2/0module.mk b/test/dist-qa-dos2/0module.mk
index a942ad9..2108b50 100644
--- a/test/dist-qa-dos2/0module.mk
+++ b/test/dist-qa-dos2/0module.mk
@@ -5,7 +5,7 @@ BUILD_HELP              += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos
 
 $(TEST_DIST_QA_DOS2):
 	$(call mb_mkdir,$(TEST_DIST_QA_DOS2))
-	$(call mb_msxhub_get_dos2,$(TEST_DIST_QA_DOS2))
+	$(call mb_msxhub_getboot_dos2,$(TEST_DIST_QA_DOS2))
 
 $(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)
diff --git a/test/dist-qa-msx1/0module.mk b/test/dist-qa-msx1/0module.mk
index 9d38a0c..6efa573 100644
--- a/test/dist-qa-msx1/0module.mk
+++ b/test/dist-qa-msx1/0module.mk
@@ -6,7 +6,6 @@ BUILD_HELP                += \\n\\t* test-dist-qa-msx1-run\\n\\t* test-dist-qa-m
 
 $(TEST_DIST_QA_MSX1):
 	$(call mb_mkdir,$(TEST_DIST_QA_MSX1))
-	$(call mb_msxhub_get_dos2,$(TEST_DIST_QA_MSX1))
 
 $(TEST_DIST_QA_MSX1)/%: bin/test/dist/% | $(TEST_DIST_QA_MSX1) $(TEST_DIST_DEPS)
 	$(call mb_copy,$<,$@)