diff --git a/src/make-on-msx/build.bat b/src/make-on-msx/build.bat
index 4e0357c..c99dca6 100644
--- a/src/make-on-msx/build.bat
+++ b/src/make-on-msx/build.bat
@@ -1,6 +1,7 @@
 echo === Trigger workaround
-rem note1: Fixme make will not build without targets files
-rem note2: Fixme make will not build without updated time stamps
+rem Fixme make will not build without targets files
+rem Fixme make will not build without updated time stamps
+dir
 copy /T build.bat NFBSSHOT.BIN
 dir/w utils
 copy /T build.bat NFBSSHOT.HEX
@@ -10,16 +11,19 @@ dir/w utils
 copy /T NFBSSHOT.MAC NFBSSHOT.BAK
 dir/w utils
 copy /T NFBSSHOT.BAK NFBSSHOT.MAC
-dir/w utils
 echo === Running make
+omsxctl fail_after 300 seconds failed_make 1
 make NFBSSHOT.MF /x > build2.bat
 echo === Concat shutdown
-echo "" > build3.bat
+echo "dir" > build1.bat
+echo "dir" > build3.bat
+echo "" > build4.bat
 IFF "exit" == %1
-	echo "shutdown.bat" > build3.bat
+	echo "shutdown" > build4.bat
 ENDIFF
-concat build2.bat + build3.bat build4.bat
+concat build1.bat + build2.bat + build3.bat + build4.bat buildrun.bat
 echo === Final script
-type build4.bat
+type buildrun.bat
 echo === Running build
-build4.bat
+omsxctl fail_after 300 seconds failed_build 1
+buildrun