diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk
index d1f0ecf..f59e8d2 100644
--- a/lib/make/mb_autoexec.mk
+++ b/lib/make/mb_autoexec.mk
@@ -85,10 +85,16 @@ endef
 MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_exit,"Appends exit emulation command.","<dir>")
 
 
-define mb_autoexec_append_joyporta_mouse
-	$(call mb_autoexec_append_cmd,$(1),omsxctl plug joyporta mouse)
+define mb_autoexec_append_plug_porta
+	$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_porta $(2))
 endef
-MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_joyporta_mouse,"Appends plug mouse in joyporta command.","<dir>")
+MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_plug_porta,"Appends an plug device into joyporta action.","<dir> <plug-dev>")
+
+
+define mb_autoexec_append_plug_portb
+	$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_plug_portb $(2))
+endef
+MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_plug_portb,"Appends an plug device into joyportb action.","<dir> <plug-dev>")
 
 
 define mb_autoexec_append_save_screenshot
diff --git a/lib/make/mb_msxpipe.mk b/lib/make/mb_msxpipe.mk
index b84f91e..3de73db 100644
--- a/lib/make/mb_msxpipe.mk
+++ b/lib/make/mb_msxpipe.mk
@@ -38,7 +38,7 @@ MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_safe_test,"Runs openMS
 
 define _mb_msxpipe_run_gui
 	$(call mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_RUN_GUI),$(MB_MSXPIPE_COLOR_BG_RUN_GUI))
-	$(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1)))
+	$(if $(filter mouse,$(4)),$(call mb_autoexec_append_plug_porta,$(1),$(4)))
 	$(call mb_autoexec_append_stop_fail,$(1))
 	$(call mb_autoexec_append_show_gui,$(1))
 	$(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to exit)
diff --git a/lib/openmsx/share/scripts/boot_exec.tcl b/lib/openmsx/share/scripts/boot_exec.tcl
index 01ef116..af8c057 100644
--- a/lib/openmsx/share/scripts/boot_exec.tcl
+++ b/lib/openmsx/share/scripts/boot_exec.tcl
@@ -43,3 +43,13 @@ proc boot_exec_show_init {} {
 	append result [openmsx_info version]
 	return $result
 }
+
+proc boot_exec_plug_porta {{plug_dev}} {
+	plug joyporta $plug_dev
+	return "mb::plug porta $plug_dev"
+}
+
+proc boot_exec_plug_portb {{plug_dev}} {
+	plug joyportb $plug_dev
+	return "mb::plug portb $plug_dev"
+}