diff --git a/hash/nascom_flop.xml b/hash/nascom_flop.xml
index b9fa359c9c8..39eea8189ab 100644
--- a/hash/nascom_flop.xml
+++ b/hash/nascom_flop.xml
@@ -14,7 +14,7 @@
 		</part>
 	</software>
 
-	<software name="avc-demo">
+	<software name="avcdemo">
 		<description>AVC Demo Disk</description>
 		<year>1982</year>
 		<publisher>Lucas Logic</publisher>
@@ -47,7 +47,7 @@
 		</part>
 	</software>
 
-	<software name="nas-sem">
+	<software name="nassem">
 		<description>NAS-Sembler 1.5</description>
 		<year>1982</year>
 		<publisher>Lucas Logic</publisher>
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index d61180e0216..f75b452f178 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -9,7 +9,6 @@
 #include "emu.h"
 #include "floppy.h"
 #include "formats/nascom_dsk.h"
-#include "softlist.h"
 
 //**************************************************************************
 //  CONSTANTS/MACROS
@@ -46,8 +45,6 @@ static MACHINE_CONFIG_FRAGMENT( nascom_fdc )
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:2", nascom_floppies, nullptr,  nascom_fdc_device::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("fd1793:3", nascom_floppies, nullptr,  nascom_fdc_device::floppy_formats)
-
-	MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop")
 MACHINE_CONFIG_END
 
 machine_config_constructor nascom_fdc_device::device_mconfig_additions() const
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index adb296ff2e5..2209cb369fe 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -705,8 +705,6 @@ static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
 	MCFG_GENERIC_EXTENSIONS("bin,rom")
 	MCFG_GENERIC_LOAD(nascom2_state, socket2_load)
 
-	MCFG_SOFTWARE_LIST_ADD("socket_list", "nascom_socket")
-
 	// nasbus expansion bus
 	MCFG_NASBUS_ADD(NASBUS_TAG)
 	MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(nascom2_state, ram_disable_w))
@@ -714,6 +712,10 @@ static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
 	MCFG_NASBUS_SLOT_ADD("nasbus2", nasbus_slot_cards, nullptr)
 	MCFG_NASBUS_SLOT_ADD("nasbus3", nasbus_slot_cards, nullptr)
 	MCFG_NASBUS_SLOT_ADD("nasbus4", nasbus_slot_cards, nullptr)
+
+	// software
+	MCFG_SOFTWARE_LIST_ADD("socket_list", "nascom_socket")
+	MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop")
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_DERIVED_CLASS( nascom2c, nascom2, nascom2_state )