diff --git a/.gitattributes b/.gitattributes
index 58f1edc0099..1ed2bfe0fd9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -57,6 +57,7 @@ hash/bbcm_cass.xml svneol=native#text/xml
 hash/bk0010.xml svneol=native#text/xml
 hash/bw12.xml svneol=native#text/xml
 hash/bw2.xml svneol=native#text/xml
+hash/bx256hp_flop.xml svneol=native#text/xml
 hash/c128_cart.xml svneol=native#text/xml
 hash/c128_flop.xml svneol=native#text/xml
 hash/c128_rom.xml svneol=native#text/xml
diff --git a/hash/bx256hp_flop.xml b/hash/bx256hp_flop.xml
new file mode 100644
index 00000000000..794c431f6bb
--- /dev/null
+++ b/hash/bx256hp_flop.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="bx256hp_flop" description="Commodore BX256-80HP / CBM 730 diskettes">
+
+	<software name="cpm10">
+		<description>CP/M-86 v1.0</description>
+		<year>1983</year>
+		<publisher>Commodore</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm8610.d80" size="533248" crc="83e8d3c0" sha1="0fd8946985da419abdaccefdbe6dd91a8edcb3d5" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm11" cloneof="cpm10">
+		<description>CP/M-86 v1.1</description>
+		<year>1983</year>
+		<publisher>Commodore</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm8611.d80" size="533248" crc="1d479584" sha1="e9ed5aae765cb8e5e7f35397095f57d8c55e3b33" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="msdos">
+		<description>MS-DOS v1.25</description>
+		<year>1982</year>
+		<publisher>Microsoft</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="msdos disk.d80" size="533248" crc="0cb75b48" sha1="5c2bcb6b84ede6ad991cca19a98a3a2998c79531" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm86" cloneof="cpm10">
+		<description>CP/M-86</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-86 disk1.d80" size="533248" crc="573ea04c" sha1="03a452c6b4bd5fdcf0ae1a51e281309e5d5a3e3a" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-86 disk2.d80" size="533248" crc="a2c258ab" sha1="748589a748e9e596885a73c14f2b1cee0afc1eab" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-8619911214.d80" size="533248" crc="38f55ca4" sha1="01155a7fe7b70c955785cf4f3f0134edcbaa021c" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86bios86-d0.d80" size="533248" crc="908e2c31" sha1="e45899e9fd906e6e448b59ae3361d810b45e758d" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86bios86-f10-ws-d0.d80" size="533248" crc="b88c352b" sha1="20fde2e8fa3e252900f6d4374b78a894d7bfcb0c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dbase2">
+		<description>CP/M-86 dBASE II</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-86dbaseii.d80" size="533248" crc="f52f4c27" sha1="ee7cc2d05e0dcfd23b9ba8513aba09af84fb14e0" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cbasic">
+		<description>CP/M-86 CBASIC</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-86_cbasic.d80" size="533248" crc="4d0097b9" sha1="98154042a9b56e0c1db38b76d133d4984909577e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cobol">
+		<description>CP/M-86 COBOL</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-cobol-disk.d80" size="533248" crc="16269b4b" sha1="9562b1b7ec9be9e4bbe8aa7b26c068379dde5101" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm-cobol-disk1.d80" size="533248" crc="441948c8" sha1="0816bd03a4246570381077bceccefb11347be028" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="pli">
+		<description>CP/M-86 PLI</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86_pli_disk1.d80" size="533248" crc="c358ad18" sha1="c85964461e234f6ddcee6972a34b832624ab4e63" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86_pli_disk2.d80" size="533248" crc="47d3c489" sha1="dc8bb9390bcb8ee9352aa2f1c7dfb452f9ef621e" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86_pli_disk3.d80" size="533248" crc="8187b78c" sha1="23ace2f0b93989ac0afa91153272753e4defc44f" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="cpm86_pli_disk2copy.d80" size="533248" crc="4fcbbbe6" sha1="9b93ce20fc13b3774880a9c95c4d79d347907bc2" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff --git a/hash/cbm2_flop.xml b/hash/cbm2_flop.xml
index e1d5079b39c..00ca48607d2 100644
--- a/hash/cbm2_flop.xml
+++ b/hash/cbm2_flop.xml
@@ -2,54 +2,6 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <softwarelist name="cbm2_flop" description="Commodore CBM-II diskettes">
 
-	<software name="2031demo">
-		<description>Commodore 2031 LP Floppy Diskette Drive Test/Demo Diskette</description>
-		<year>198?</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="174848">
-				<rom name="2031lp-demo.d64" size="174848" crc="9c697562" sha1="940da4a6638058d6899fb629738d7ad8605b3976" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="8250test">
-		<description>Commodore 8250LP Floppy Disk Drive Test/Demo Diskette</description>
-		<year>198?</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="1066496">
-				<rom name="8250lp-demo.d82" size="1066496" crc="cbd23e48" sha1="acedaa2e77f7a113bfe77760eb67ba45099b50db" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="1001test">
-		<description>Commodore SFD-1001 Floppy Disk Drive Test/Demo Diskette</description>
-		<year>198?</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="1066496">
-				<rom name="sfd1001-demo.d82" size="1066496" crc="83b12b13" sha1="316fa89b4553ff1d411dc14ffcdd477c1fb284da" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="1001testa" cloneof="1001test">
-		<description>Commodore SFD-1001 Floppy Disk Drive Test/Demo Diskette (8050 Format)</description>
-		<year>198?</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="sfdtest8050fmt.d80" size="533248" crc="3845c0b9" sha1="56473932a35f2caedf370c51f1debd8664a14b5b" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="burnin">
 		<description>Factory Burn In Diagnostics for B Series</description>
 		<year>1983</year>
@@ -123,30 +75,6 @@
 		</part>
 	</software>
 
-	<software name="cpm10">
-		<description>CP/M 86 v1.0</description>
-		<year>1983</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="cpm8610.d80" size="533248" crc="83e8d3c0" sha1="0fd8946985da419abdaccefdbe6dd91a8edcb3d5" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="cpm11" cloneof="cpm10">
-		<description>CP/M 86 v1.1</description>
-		<year>1983</year>
-		<publisher>Commodore</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="cpm8611.d80" size="533248" crc="1d479584" sha1="e9ed5aae765cb8e5e7f35397095f57d8c55e3b33" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="proxa7k">
 		<description>Proxa 7000</description>
 		<year>198?</year>
@@ -177,6 +105,98 @@
 		</part>
 	</software>
 
+	<software name="cpm6509">
+		<description>CP/M 6509</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="6509bioscpm-d0.d80" size="533248" crc="b5333233" sha1="83907995853a8aa38e8fb5609841f2f91f513758" offset="0" />
+			</dataarea>
+		</part>
+
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="6509bioscpm-d1.d80" size="533248" crc="bc746f8c" sha1="f1bfafb60aee1acd2afd00fa165675a787a4d14a" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fastbus">
+		<description>B-128 Fast Bus</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="b-128 fast bus.d80" size="533248" crc="04cb3692" sha1="4d60d77a4a25aeafa608c7198d8fb59f4b135518" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="diags">
+		<description>B128/256 Diags</description>
+		<year>198?</year>
+		<publisher>&lt;unknown&gt;</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="b128-256diags.d80" size="533248" crc="8082fe73" sha1="86cf972e13ff729b4916e9995c51658973a1c50d" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="beeline">
+		<description>BeeLine (v2.0)</description>
+		<year>1986</year>
+		<publisher>J &amp; K Lemkelde</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="beeline.d80" size="533248" crc="e2a2a13c" sha1="3c8c26b7ef402c8f39429302ac2bf754ca974635" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="normcopy">
+		<description>Norm's Copier for the 8050</description>
+		<year>198?</year>
+		<publisher>Jesse Knight</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="norm's copier.d80" size="533248" crc="913907cf" sha1="16c824ee1001fd9682b2fb627003529b30fa5e31" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="superbse">
+		<description>Superbase 700 (v2.06)</description>
+		<year>1983</year>
+		<publisher>Precision Software</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="superbase 700.d80" size="533248" crc="4c4b1b9e" sha1="70ab9636609de2eb2a1a7963b6b5eafdfa98cb89" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="supersc2">
+		<description>Superscript II (v1.0)</description>
+		<year>1982</year>
+		<publisher>Precision Software</publisher>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="533248">
+				<rom name="superscriptii.d80" size="533248" crc="e3da7e0d" sha1="e9e303857ee4b0c0655050a97142f75b2ad13838" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- CBUG -->
+
 	<software name="cbug02">
 		<description>CBUG #2</description>
 		<year>1983</year>
@@ -1725,92 +1745,52 @@
 		</part>
 	</software>
 
-	<software name="bioscpm">
-		<description>6509 BIOS CP/M</description>
+	<!-- Test/Demo -->
+
+	<software name="2031demo">
+		<description>Commodore 2031 LP Floppy Diskette Drive Test/Demo Diskette</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Commodore</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="6509bioscpm-d0.d80" size="533248" crc="b5333233" sha1="83907995853a8aa38e8fb5609841f2f91f513758" offset="0" />
-			</dataarea>
-		</part>
-
-		<part name="flop2" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="6509bioscpm-d1.d80" size="533248" crc="bc746f8c" sha1="f1bfafb60aee1acd2afd00fa165675a787a4d14a" offset="0" />
+			<dataarea name="flop" size="174848">
+				<rom name="2031lp-demo.d64" size="174848" crc="9c697562" sha1="940da4a6638058d6899fb629738d7ad8605b3976" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="fastbus">
-		<description>B-128 Fast Bus</description>
+	<software name="8250test">
+		<description>Commodore 8250LP Floppy Disk Drive Test/Demo Diskette</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Commodore</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="b-128 fast bus.d80" size="533248" crc="04cb3692" sha1="4d60d77a4a25aeafa608c7198d8fb59f4b135518" offset="0" />
+			<dataarea name="flop" size="1066496">
+				<rom name="8250lp-demo.d82" size="1066496" crc="cbd23e48" sha1="acedaa2e77f7a113bfe77760eb67ba45099b50db" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="diags">
-		<description>B128/256 Diags</description>
+	<software name="1001test">
+		<description>Commodore SFD-1001 Floppy Disk Drive Test/Demo Diskette</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Commodore</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="b128-256diags.d80" size="533248" crc="8082fe73" sha1="86cf972e13ff729b4916e9995c51658973a1c50d" offset="0" />
+			<dataarea name="flop" size="1066496">
+				<rom name="sfd1001-demo.d82" size="1066496" crc="83b12b13" sha1="316fa89b4553ff1d411dc14ffcdd477c1fb284da" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="beeline">
-		<description>BeeLine (v2.0)</description>
-		<year>1986</year>
-		<publisher>J &amp; K Lemkelde</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="beeline.d80" size="533248" crc="e2a2a13c" sha1="3c8c26b7ef402c8f39429302ac2bf754ca974635" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="normcopy">
-		<description>Norm's Copier for the 8050</description>
+	<software name="1001test_ss" cloneof="1001test">
+		<description>Commodore SFD-1001 Floppy Disk Drive Test/Demo Diskette (8050 Format)</description>
 		<year>198?</year>
-		<publisher>Jesse Knight</publisher>
+		<publisher>Commodore</publisher>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="533248">
-				<rom name="norm's copier.d80" size="533248" crc="913907cf" sha1="16c824ee1001fd9682b2fb627003529b30fa5e31" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="superbse">
-		<description>Superbase 700 (v2.06)</description>
-		<year>1983</year>
-		<publisher>Precision Software</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="superbase 700.d80" size="533248" crc="4c4b1b9e" sha1="70ab9636609de2eb2a1a7963b6b5eafdfa98cb89" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="supersc2">
-		<description>Superscript II (v1.0)</description>
-		<year>1982</year>
-		<publisher>Precision Software</publisher>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="533248">
-				<rom name="superscriptii.d80" size="533248" crc="e3da7e0d" sha1="e9e303857ee4b0c0655050a97142f75b2ad13838" offset="0" />
+				<rom name="sfdtest8050fmt.d80" size="533248" crc="3845c0b9" sha1="56473932a35f2caedf370c51f1debd8664a14b5b" offset="0" />
 			</dataarea>
 		</part>
 	</software>