diff --git a/.gitattributes b/.gitattributes
index f9177365bb4..75993ce1955 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -131,6 +131,7 @@ hash/pc98.xml svneol=native#text/xml
 hash/pce.xml svneol=native#text/xml
 hash/pcecd.xml svneol=native#text/xml
 hash/pcw.xml svneol=native#text/xml
+hash/pcw16.xml svneol=native#text/xml
 hash/pico.xml svneol=native#text/xml
 hash/pippin.xml svneol=native#text/xml
 hash/pippin_flop.xml svneol=native#text/xml
diff --git a/hash/pcw16.xml b/hash/pcw16.xml
new file mode 100644
index 00000000000..356623c9bce
--- /dev/null
+++ b/hash/pcw16.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="pcw16" description="Amstrad PCW16 disk images">
+
+	<software name="osrd112">
+		<description>OS Rescue Disk 1.12</description>
+		<year>1997</year>
+		<publisher>Amstrad</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="os rescue disk 1.12.dsk" size="1474560" crc="bb8fb2d8" sha1="623ec354522d87b038d383e0b2a622375efc0f15" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm22hd">
+		<description>CP/M 2.2 Program Disk (1.44M)</description>
+		<year>1999</year>
+		<publisher>John Elliott</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="cpm 2.2 program disk 1440.dsk" size="1474560" crc="8466fddb" sha1="30d8350df60d5ec68c97372b471573ece185a18f" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+
+	<software name="cpm22dd">
+		<description>CP/M 2.2 Program Disk (720K)</description>
+		<year>1999</year>
+		<publisher>John Elliott</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="737280">
+				<rom name="cpm 2.2 program disk 720.dsk" size="737280" crc="683b9cd9" sha1="3d2beb02d1ae2e11cb1af5238a496532ecdbd624" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm22sod">
+		<description>CP/M 2.2 Start-of-day Disk</description>
+		<year>1999</year>
+		<publisher>John Elliott</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="737280">
+				<rom name="cpm 2.2 start-of-day.dsk" size="737280" crc="c46ab250" sha1="b948c48334955637630ef54400b9db815e33c8a4" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+
+	<software name="cpm31sod">
+		<description>CP/M 3.1 Start-of-day Disk</description>
+		<year>1999</year>
+		<publisher>John Elliott</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="737280">
+				<rom name="cpm 3.1 start-of-day.dsk" size="737280" crc="369938b5" sha1="8eb48ac28786cde266e02469995f4bc30db9696a" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c
index ee03f5890ee..9263ecdb322 100644
--- a/src/mess/drivers/pcw16.c
+++ b/src/mess/drivers/pcw16.c
@@ -1100,6 +1100,8 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state )
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", 0, pcw16_floppy_formats)
     MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", 0, pcw16_floppy_formats)
 
+	MCFG_SOFTWARE_LIST_ADD("disk_list","pcw16")
+
 	/* internal ram */
 	MCFG_RAM_ADD(RAM_TAG)
 	MCFG_RAM_DEFAULT_SIZE("2M")