diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 6ac7b7a..b455c92 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -5,26 +5,31 @@ MB_OPENMSX_SPEED        ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,3
 MB_OPENMSX_EXTS         ?=
 MB_OPENMSX_EXTRA_SLOT   ?= -ext slotexpander
 MB_OPENMSX_EXTRA_MEM    ?= -ext ram4mb
-MB_OPENMSX_EXTRA_IDE    ?= -ext ide-nextor
+MB_OPENMSX_EXTRA_HDD    ?= -ext ide-nextor
 MB_OPENMSX_JOYPORTA     ?=
 MB_OPENMSX_JOYPORTB     ?=
 MB_OPENMSX_SCALE_FACTOR ?= 3
 MB_OPENMSX_THROTTLE     ?= off
 MB_OPENMSX_RENDERER     ?=
+MB_OPENMSX_SCRIPTS      ?= ~/.openMSX/share/scripts
 MB_OPENMSX_ARGS = \
   -machine $(MB_OPENMSX_MACHINE) \
   $(MB_OPENMSX_EXTRA_SLOT) \
-  $(MB_OPENMSX_EXTRA_IDE) \
+  $(MB_OPENMSX_EXTRA_HDD) \
   $(MB_OPENMSX_EXTRA_MEM) \
-  $(MB_OPENMSX_EXTS) \
-  -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
-  -script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \
-  -script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \
-  -script $(PATH_MSXBUILD_REAL)/lib/openmsx/omsxctl.tcl
+  $(MB_OPENMSX_EXTS)
+
+define _mb_openmsx_setup
+	$(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
+	$(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
+	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_env.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl,$(MB_OPENMSX_SCRIPTS)))
+	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_hdd.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl,$(MB_OPENMSX_SCRIPTS)))
+	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/fail_after.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl,$(MB_OPENMSX_SCRIPTS)))
+	$(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/))
+endef
 
 define _mb_openmsx_run
 	@echo === Running openMSX
-	$(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
 	FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
 	FAIL_AFTER_PATH=bin \
 	BOOT_HDD_PATH="$(1)" \
@@ -40,6 +45,7 @@ define _mb_openmsx_run
 endef
 
 define mb_openmsx_dosctl
-	$(call mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
+	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/omsxctl.tcl),,$(call _mb_openmsx_setup))
+	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_SCRIPTS)/omsxctl.com,$(1)))
 	$(call _mb_openmsx_run,$(1))
 endef
diff --git a/lib/openmsx/ide-nextor.xml b/lib/openmsx/ide-nextor.xml
new file mode 100644
index 0000000..f181b7b
--- /dev/null
+++ b/lib/openmsx/ide-nextor.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!DOCTYPE msxconfig SYSTEM 'msxconfig2.dtd'>
+<msxconfig>
+	<info>
+		<name>Sunrise ATA-IDE Nextor</name>
+		<manufacturer>Sunrise</manufacturer>
+		<code />
+		<release_year>2024</release_year>
+		<description>ATA-IDE interface with hard disk.</description>
+		<type>external hard disk</type>
+	</info>
+	<devices>
+		<primary slot="any">
+			<secondary slot="any">
+				<SunriseIDE id="Sunrise IDE">
+					<mem base="0x0000" size="0x10000" />
+					<rom>
+						<sha1>dca824d7b0ddf25c6e87a8098e97ab7489725f57</sha1> <!-- SHA1 of Nextor-2.1.1.SunriseIDE.ROM -->
+					</rom>
+					<master>
+						<type>IDEHD</type>
+						<filename>hd.dsk</filename>
+					</master>
+				</SunriseIDE>
+			</secondary>
+		</primary>
+	</devices>
+</msxconfig>
\ No newline at end of file