diff --git a/hash/c128_flop.xml b/hash/c128_flop.xml
index 905a10f14a8..db96a39c394 100644
--- a/hash/c128_flop.xml
+++ b/hash/c128_flop.xml
@@ -619,4 +619,30 @@
 		</part>
 	</software>
 
+	<software name="lunix128">
+		<description>LUnix Next Generation (v0.21)</description>
+		<year>2004</year>
+		<publisher>LNG-Project</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="lunix-c128.d64" size="174848" crc="253218c3" sha1="2169f2666bdf39cbd7bfb3811f58761c9bfa6020" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lunix128reu" cloneof="lunix128">
+		<description>LUnix Next Generation (v0.21, REU)</description>
+		<year>2004</year>
+		<publisher>LNG-Project</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="lunix-c128-reu.d64" size="174848" crc="234af728" sha1="741127341c1bef3dbe5f137680f6df2547f5d02e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/hash/c64_flop.xml b/hash/c64_flop.xml
index 68a4472849b..8720343638d 100644
--- a/hash/c64_flop.xml
+++ b/hash/c64_flop.xml
@@ -798,46 +798,6 @@
 		</part>
 	</software>
 
-	<software name="cpm">
-		<description>Commodore 64 CP/M Cartridge Boot Disk</description>
-		<year>1982</year>
-		<publisher>Commodore</publisher>
-		<sharedfeat name="requirement" value="c64_cart:cpm"/>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="174848">
-				<rom name="cpm.d64" size="174848" crc="cc7473e0" sha1="82d8fd45bd4b6e93df7090b325ac6c9b6597fe36" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="cpma" cloneof="cpm">
-		<description>Commodore 64 CP/M Cartridge Boot Disk (Alt)</description>
-		<year>1982</year>
-		<publisher>Commodore</publisher>
-		<sharedfeat name="requirement" value="c64_cart:cpm"/>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="174848">
-				<rom name="cpm2.d64" size="174848" crc="b78211f0" sha1="37d65e4e7d04994c4e69918530aca444bda11f6e" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="cpmb" cloneof="cpm">
-		<description>Commodore 64 CP/M Cartridge Boot Disk (Alt 2)</description>
-		<year>1982</year>
-		<publisher>Commodore</publisher>
-		<info name="serial" value="D CP2 622-04414" />
-		<sharedfeat name="requirement" value="c64_cart:cpm"/>
-
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="174848">
-				<rom name="cpm3.d64" size="174848" crc="926d326d" sha1="8d5e6fac79c9f5e463a3514d8b37175e6879cc36" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="swiftlnk">
 		<description>CMD SwiftLink</description>
 		<year>1990</year>
@@ -898,6 +858,100 @@
 		</part>
 	</software>
 
+	<!-- Operating Systems -->
+
+	<software name="contiki">
+		<description>Contiki Desktop OS 1.0</description>
+		<year>2003</year>
+		<publisher>Contiki Project</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="contiki-1.0.d64" size="174848" crc="259c97f7" sha1="7f4ada8f1cf9246b760364d31a9f3bc1493a8b1c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm">
+		<description>Commodore 64 CP/M Cartridge Boot Disk</description>
+		<year>1982</year>
+		<publisher>Commodore</publisher>
+		<sharedfeat name="requirement" value="c64_cart:cpm"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="cpm.d64" size="174848" crc="cc7473e0" sha1="82d8fd45bd4b6e93df7090b325ac6c9b6597fe36" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpma" cloneof="cpm">
+		<description>Commodore 64 CP/M Cartridge Boot Disk (Alt)</description>
+		<year>1982</year>
+		<publisher>Commodore</publisher>
+		<sharedfeat name="requirement" value="c64_cart:cpm"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="cpm2.d64" size="174848" crc="b78211f0" sha1="37d65e4e7d04994c4e69918530aca444bda11f6e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpmb" cloneof="cpm">
+		<description>Commodore 64 CP/M Cartridge Boot Disk (Alt 2)</description>
+		<year>1982</year>
+		<publisher>Commodore</publisher>
+		<info name="serial" value="D CP2 622-04414" />
+		<sharedfeat name="requirement" value="c64_cart:cpm"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="cpm3.d64" size="174848" crc="926d326d" sha1="8d5e6fac79c9f5e463a3514d8b37175e6879cc36" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="geckos">
+		<description>GeckOS/A65 (v2.0)</description>
+		<year>1999</year>
+		<publisher>André Fachat</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="c64.d64" size="174848" crc="103a3ef6" sha1="54f484e7bd78ba65844cc1b3b2a2d43cacbebd0e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lunix">
+		<description>LUnix Next Generation (v0.21)</description>
+		<year>2004</year>
+		<publisher>LNG-Project</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="lunix-c64.d64" size="174848" crc="d45d5ffa" sha1="1c1d505670035e4a14f0c6446761e59285101767" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lunixreu" cloneof="lunix">
+		<description>LUnix Next Generation (v0.21, REU)</description>
+		<year>2004</year>
+		<publisher>LNG-Project</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+	
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="lunix-c64-reu.d64" size="174848" crc="47e6bb14" sha1="e4057ff831b19a6a10167e0b6ec0aeaa7be1c436" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- MIDI -->
 
 	<software name="midi8p">
diff --git a/hash/cbm8096_flop.xml b/hash/cbm8096_flop.xml
index 263cb9224b4..492518edf2c 100644
--- a/hash/cbm8096_flop.xml
+++ b/hash/cbm8096_flop.xml
@@ -14,4 +14,17 @@
 		</part>
 	</software>
 
+	<software name="geckos">
+		<description>GeckOS/A65 (v2.0)</description>
+		<year>1999</year>
+		<publisher>André Fachat</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="cbm8x96.d64" size="174848" crc="33210394" sha1="AB59246300847B9CCB00B10F220253BAE20E76B2" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/hash/pet_flop.xml b/hash/pet_flop.xml
index c86f7c66ebd..6634ec2c9f7 100644
--- a/hash/pet_flop.xml
+++ b/hash/pet_flop.xml
@@ -225,4 +225,17 @@
 		</part>
 	</software>
 
+	<software name="geckos">
+		<description>GeckOS/A65 (v2.0)</description>
+		<year>1999</year>
+		<publisher>André Fachat</publisher>
+		<sharedfeat name="compatibility" value="NTSC,PAL"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="174848">
+				<rom name="pet32k.d64" size="174848" crc="0544293a" sha1="bc71e230a56b3f085b93851d667438549d93f5ee" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>