diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 8d38404c1d6..6d5d8569902 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -38,6 +38,10 @@ end
 
 if (BUSES["A800"]~=null) then
 	files {
+		MAME_DIR .. "src/devices/bus/a800/a8sio.c",
+		MAME_DIR .. "src/devices/bus/a800/a8sio.h",
+		MAME_DIR .. "src/devices/bus/a800/cassette.c",
+		MAME_DIR .. "src/devices/bus/a800/cassette.h",
 		MAME_DIR .. "src/devices/bus/a800/a800_slot.c",
 		MAME_DIR .. "src/devices/bus/a800/a800_slot.h",
 		MAME_DIR .. "src/devices/bus/a800/a800_carts.h",
@@ -51,21 +55,6 @@ if (BUSES["A800"]~=null) then
 end
 
 
----------------------------------------------------
---
---@src/devices/bus/a8sio/a8sio.h,BUSES["A8SIO"] = true
----------------------------------------------------
-
-if (BUSES["A8SIO"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/bus/a8sio/a8sio.c",
-		MAME_DIR .. "src/devices/bus/a8sio/a8sio.h",
-		MAME_DIR .. "src/devices/bus/a8sio/cassette.c",
-		MAME_DIR .. "src/devices/bus/a8sio/cassette.h",
-	}
-end
-
-
 ---------------------------------------------------
 --
 --@src/devices/bus/abcbus/abcbus.h,BUSES["ABCBUS"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 2e49364618c..0eb2db8d61d 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -574,7 +574,6 @@ BUSES["A1BUS"] = true
 BUSES["A2BUS"] = true
 BUSES["A7800"] = true
 BUSES["A800"] = true
-BUSES["A8SIO"] = true
 BUSES["ABCBUS"] = true
 BUSES["ABCKB"] = true
 BUSES["ADAM"] = true
diff --git a/src/devices/bus/a8sio/a8sio.c b/src/devices/bus/a800/a8sio.c
similarity index 100%
rename from src/devices/bus/a8sio/a8sio.c
rename to src/devices/bus/a800/a8sio.c
diff --git a/src/devices/bus/a8sio/a8sio.h b/src/devices/bus/a800/a8sio.h
similarity index 100%
rename from src/devices/bus/a8sio/a8sio.h
rename to src/devices/bus/a800/a8sio.h
diff --git a/src/devices/bus/a8sio/cassette.c b/src/devices/bus/a800/cassette.c
similarity index 100%
rename from src/devices/bus/a8sio/cassette.c
rename to src/devices/bus/a800/cassette.c
diff --git a/src/devices/bus/a8sio/cassette.h b/src/devices/bus/a800/cassette.h
similarity index 100%
rename from src/devices/bus/a8sio/cassette.h
rename to src/devices/bus/a800/cassette.h
diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c
index 02a013ab35c..73844078019 100644
--- a/src/mess/drivers/atari400.c
+++ b/src/mess/drivers/atari400.c
@@ -50,7 +50,7 @@
 #include "machine/atarifdc.h"
 #include "bus/a800/a800_slot.h"
 #include "bus/a800/a800_carts.h"
-#include "bus/a8sio/a8sio.h"
+#include "bus/a800/a8sio.h"
 
 
 /******************************************************************************