diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk
index 3c4afe1..23617ad 100644
--- a/src/make-on-msx/0module.mk
+++ b/src/make-on-msx/0module.mk
@@ -21,7 +21,7 @@ $(MAKE_ON_MSX_BIN)/build.bat: $(MAKE_ON_MSX_SRC)/build.bat | $(MAKE_ON_MSX_BIN)/
 
 BUILD_HELP += \\n\\t* $(MAKE_ON_MSX_BIN)/nfbsshot.bin
 $(MAKE_ON_MSX_BIN)/nfbsshot.bin: | $(MAKE_ON_MSX_BIN)/build.bat
-	$(call mb_autoexec_safe_cmd,$(MAKE_ON_MSX_BIN),build exit)
+	$(call mb_autoexec_safe_cmd,$(MAKE_ON_MSX_BIN),build shutdown)
 	$(call mb_openmsx_dosctl,$(MAKE_ON_MSX_BIN))
 
 BUILD_HELP += \\n\\t* $(MAKE_ON_MSX_BIN)/@assert
diff --git a/src/make-on-msx/build.bat b/src/make-on-msx/build.bat
index c99dca6..1289d6e 100644
--- a/src/make-on-msx/build.bat
+++ b/src/make-on-msx/build.bat
@@ -13,14 +13,16 @@ dir/w utils
 copy /T NFBSSHOT.BAK NFBSSHOT.MAC
 echo === Running make
 omsxctl fail_after 300 seconds failed_make 1
+echo "dir" > build1.bat
 make NFBSSHOT.MF /x > build2.bat
 echo === Concat shutdown
-echo "dir" > build1.bat
 echo "dir" > build3.bat
-echo "" > build4.bat
-IFF "exit" == %1
-	echo "shutdown" > build4.bat
+IFF "shutdown" == %1
+	SET lastcmd=shutdown
+ELSE
+	SET lastcmd=omsxctl fail_after 0
 ENDIFF
+echo %lastcmd% > build4.bat
 concat build1.bat + build2.bat + build3.bat + build4.bat buildrun.bat
 echo === Final script
 type buildrun.bat