diff --git a/hash/pc1512.xml b/hash/pc1512.xml
index af187207bcf..1a78f1407d2 100644
--- a/hash/pc1512.xml
+++ b/hash/pc1512.xml
@@ -103,28 +103,28 @@
 		<publisher>Amstrad</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 1"/>
+			<feature name="part_id" value="MICROSOFT MS DOS OPERATING SYSTEM - START UP &amp; UTILITIES v3.2"/>
 			<dataarea name="flop" size="368640">
 				<rom name="46001.img" size="368640" crc="d8090373" sha1="4dbe5b78196389546410ad136d815456bc4593f3" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 2"/>
+			<feature name="part_id" value="GEM STARTUP v2.1U"/>
 			<dataarea name="flop" size="368640">
 				<rom name="46002.img" size="368640" crc="801c6584" sha1="20e1b46eda0a24c89127e4dd6f46a203b4f3a091" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 3"/>
+			<feature name="part_id" value="GEM DESKTOP v2.0U / Locomotive BASIC 2 v1.2"/>
 			<dataarea name="flop" size="368640">
 				<rom name="46003.img" size="368640" crc="b8b5338b" sha1="28d6a6af565a222573c42cb615d398775c908ee2" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 4"/>
+			<feature name="part_id" value="GEM PAINT v2.0U"/>
 			<dataarea name="flop" size="368640">
 				<rom name="46004.img" size="368640" crc="adf8c856" sha1="6de8d6f44e0e28546ed0432ed63c90e5fe6a658d" offset="0" />
 			</dataarea>
diff --git a/hash/pc1640.xml b/hash/pc1640.xml
index a86b14a7420..47bdc810942 100644
--- a/hash/pc1640.xml
+++ b/hash/pc1640.xml
@@ -8,28 +8,28 @@
 		<publisher>Amstrad</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 1"/>
+			<feature name="part_id" value="MICROSOFT MS DOS OPERATING SYSTEM - Startup &amp; Utilities v3.2"/>
 			<dataarea name="flop" size="368640">
 				<rom name="47001.img" size="368640" crc="274129d5" sha1="94d225bfd8813c4434ec989f2340623d9496ba49" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 2"/>
+			<feature name="part_id" value="GEM STARTUP v2.1U"/>
 			<dataarea name="flop" size="368640">
 				<rom name="47002.img" size="368640" crc="5361b69c" sha1="256214d06735b4716321aded23d759f3c0b5b56a" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 3"/>
+			<feature name="part_id" value="GEM DESKTOP v2.0U / Locomotive BASIC 2 v1.2"/>
 			<dataarea name="flop" size="368640">
 				<rom name="47003.img" size="368640" crc="8f21e56c" sha1="d4a8183cfb7ec5e361dbf549357b9df49672f7fc" offset="0" />
 			</dataarea>
 		</part>
 
 		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="System Disc 4"/>
+			<feature name="part_id" value="GEM PAINT v2.0U / GEM Output v1.23 &amp; Supplementary Programs"/>
 			<dataarea name="flop" size="368640">
 				<rom name="47004.img" size="368640" crc="b34d7638" sha1="1f82a0d9789db97f0ce2aa9409871957b355ff5b" offset="0" />
 			</dataarea>
diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c
index 3a4a469c2f5..78e9b4c92be 100644
--- a/src/mess/drivers/pc1512.c
+++ b/src/mess/drivers/pc1512.c
@@ -17,6 +17,7 @@
     - Amstrad SM2400 internal modem
     - Amstrad RP4 diagnostic ISA card (PC1512)
     - Amstrad RP5-2 diagnostic ISA card (PC1640)
+    - 40291/8908 B ROM on PC1640 HD30 controller card
 
 */
 
@@ -1469,6 +1470,7 @@ ROM_END
 
 #define rom_pc1640dd 	rom_pc1640
 #define rom_pc1640hd20 	rom_pc1640
+#define rom_pc1640hd30 	rom_pc1640
 
 
 
@@ -1484,3 +1486,4 @@ COMP( 1986, pc1512hd20, pc1512,     0,      pc1512hd,   pc1512, driver_device,
 COMP( 1987, pc1640,     0,          0,      pc1640,     pc1640, driver_device,      0,      "Amstrad plc",  "PC1640 SD",    GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
 COMP( 1987, pc1640dd,   pc1640,     0,      pc1640dd,   pc1640, driver_device,      0,      "Amstrad plc",  "PC1640 DD",    GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
 COMP( 1987, pc1640hd20, pc1640,     0,      pc1640hd,   pc1640, driver_device,      0,      "Amstrad plc",  "PC1640 HD20",  GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+COMP( 1987, pc1640hd30, pc1640,     0,      pc1640hd,   pc1640, driver_device,      0,      "Amstrad plc",  "PC1640 HD30",  GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index 12bd8964ceb..4a3eabb9775 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -741,6 +741,7 @@ pc1512hd20
 pc1640
 pc1640dd
 pc1640hd20
+pc1640hd30
 pc2086
 pc3086
 pc2386