diff --git a/Makefile b/Makefile
index f6476f6..4365905 100644
--- a/Makefile
+++ b/Makefile
@@ -21,5 +21,6 @@ clean:
 	$(call mb_clean,$(PATH_BIN))
 
 -include Makelocal.mk
+MB_OPENMSX_PATH_BIN ?= $(PATH_BIN)
 include lib/make/msxbuild.mk
 include $(INC_TEST)
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index b455c92..aa19357 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -1,4 +1,5 @@
 
+MB_OPENMSX_PATH_BIN     ?= bin
 MB_OPENMSX_BOOT_TIMEOUT ?= 25
 MB_OPENMSX_MACHINE      ?= Philips_NMS_8250
 MB_OPENMSX_SPEED        ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
@@ -31,9 +32,9 @@ endef
 define _mb_openmsx_run
 	@echo === Running openMSX
 	FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
-	FAIL_AFTER_PATH=bin \
+	FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \
 	BOOT_HDD_PATH="$(1)" \
-	BOOT_HDD_IMAGE="$(1)/../dsk.img" \
+	BOOT_HDD_IMAGE="$(MB_OPENMSX_PATH_BIN)/dsk-$(notdir $(1)).img" \
 	JOYPORTA=$(MB_OPENMSX_JOYPORTA) \
 	JOYPORTB=$(MB_OPENMSX_JOYPORTB) \
 	SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \