diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk
index 8650fd6..5478631 100644
--- a/src/dist-run/0module.mk
+++ b/src/dist-run/0module.mk
@@ -2,27 +2,23 @@
 DIST_RUN_NAME		:= dist-run
 DIST_RUN_BIN		:= $(PATH_BIN)/$(DIST_RUN_NAME)
 DIST_RUN_SRC		:= $(PATH_SRC)/$(DIST_RUN_NAME)
-DIST_RUN_INC		:= autoexec.bat COMMAND.COM MSXDOS.SYS
+DIST_RUN_INC		:= autoexec.bat init.com dome.000
 DIST_RUN_INC_BIN 	:= $(patsubst %,$(DIST_RUN_BIN)/%,$(DIST_RUN_INC))
-DIST_RUN_INC_SRC 	:= $(patsubst %,$(DIST_RUN_SRC)/%,$(DIST_RUN_INC))
-DIST_RUN_DEP_TAR	:= $(PATH_BIN)/dist.tar.gz
-DIST_RUN_DEP		:= $(DIST_RUN_BIN)/tara.com
-
 
 $(DIST_RUN_BIN):
 	$(call mod_mkdir,$(DIST_RUN_BIN))
 
 $(DIST_RUN_BIN)/autoexec.bat: $(DIST_RUN_SRC)/autoexec.bat | $(DIST_RUN_BIN)
 	unix2dos -n $< $@;
-	
-$(DIST_RUN_BIN)/COMMAND.COM: $(DIST_RUN_SRC)/COMMAND.COM | $(DIST_RUN_BIN)
-	cp $< $@;
-	
-$(DIST_RUN_BIN)/MSXDOS.SYS: $(DIST_RUN_SRC)/MSXDOS.SYS | $(DIST_RUN_BIN)
-	cp $< $@;
 
-$(DIST_RUN_DEP): $(DIST_RUN_DEP_TAR) | $(DIST_RUN_BIN)
-	cp $(PATH_BIN)/dist/* $(DIST_RUN_BIN);
+$(DIST_RUN_BIN)/init.com: bin/init/init.com | $(DIST_RUN_BIN)
+	cp $< $@;
+$(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
+	cp $< $@;
+	cp bin/domelib/*.zop $(DIST_RUN_BIN);
+	cp bin/domelib/*.dat $(DIST_RUN_BIN);
+	cp bin/domelib/*.00* $(DIST_RUN_BIN);
+	
 
-$(DIST_RUN_NAME): $(DIST_RUN_INC_BIN) $(DIST_RUN_DEP)
-	openmsx -machine Philips_NMS_8250 -ext video9000 -ext ram4mb -ext ide -diska $(DIST_RUN_BIN);
+$(DIST_RUN_NAME): $(DIST_RUN_INC_BIN)
+	$(call run_openmsx_dos2, $(DIST_RUN_BIN))
diff --git a/src/dist-run/autoexec.bat b/src/dist-run/autoexec.bat
index 0416f3f..2fbd29b 100644
--- a/src/dist-run/autoexec.bat
+++ b/src/dist-run/autoexec.bat
@@ -1,2 +1,16 @@
-
-udome
+mode 80
+echo === Boot watchdog timeout
+omsxctl set boot_wdt
+echo === Disable boot watchdog
+omsxctl set boot_wdt 0
+echo === Set fail_after
+omsxctl fail_after 3000
+echo === Plug mouse
+omsxctl plug joyporta mouse
+echo === Set speed
+omsxctl set speed 350
+echo === Enable speed throttling
+omsxctl set throttle on
+echo === Start program
+init
+omsxctl exit