diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp
index ba8c375a379..e686558995b 100644
--- a/src/mame/drivers/neptunp2.cpp
+++ b/src/mame/drivers/neptunp2.cpp
@@ -2,7 +2,7 @@
 // copyright-holders:Tomasz Slanina
 /***************************************************************************
 
-    Neptune's Pearls (c) Unidesa?
+    Neptune's Pearls (c) Unidesa
 
     skeleton driver, can't do much without gfx roms anyway.
 
@@ -88,7 +88,8 @@ Unidesa Cirsa Multi Points
 
 P4, P8, P13, P15, P16 and P19 are unused.
 
-Some service manuals contains the complete PCB schematics (e.g., see the "Manual Técnico Cirsa Vulcano" PDF).
+The service manual contains the complete PCB schematics:
+https://media.recreativas.org/manuales/201909/cirsa-unidesa-carta-control-960606-5-manual.pdf
 
 */
 
@@ -229,24 +230,6 @@ ROM_START( neptunp2 )
 	ROM_LOAD( "flash_roms", 0x00000, 0x10000, NO_DUMP )
 ROM_END
 
-ROM_START( rockroll ) // PCB serigraphed 'CB1 (CS4)' and '960606-5 CPU'. It was found with most sockets unpopulated. This is mechanical, no GFX but a Samsung VFD.
-	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD( "u2",   0x000000, 0x100000, NO_DUMP )
-
-	ROM_REGION( 0x100000, "prg_data", 0 )
-	ROM_LOAD( "u3",   0x000000, 0x100000, NO_DUMP )
-
-	ROM_REGION( 0x200000, "oki", 0 )
-	ROM_LOAD( "c.rock_n_roll_b-2103_6219_otp_b-82_m27c801.u14",  0x000000, 0x100000, CRC(963d184b) SHA1(8ad8b3215d3fc513dfae27bea2ed2ae9939c0f02) )
-	ROM_LOAD( "u15",  0x100000, 0x100000, NO_DUMP ) // it's also possible it wasn't ever populated
-
-	ROM_REGION( 0x800, "eeprom", 0 )
-	ROM_LOAD( "24lc16b.u10",  0x000, 0x800, CRC(fee6b8e4) SHA1(cb0ddd23e0decda540f22ebb455c91c2aabc60fd) )
-
-	ROM_REGION( 0x104, "plds", 0 )
-	ROM_LOAD( "pat_063_tibpal16l8-25cn.bin",  0x000, 0x104, NO_DUMP ) // Protected
-ROM_END
-
 ROM_START( mexlindo )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD( "m27c801.u2",   0x000000, 0x100000, CRC(b3269247) SHA1(85911f130325e3082a83cd46b65c270c33e94d3f) )
@@ -268,6 +251,51 @@ ROM_START( mexlindo )
 	ROM_LOAD( "24c16_it7_0,05.u10",  0x000, 0x800, CRC(d84a3fae) SHA1(56e743a74d1934a6c6d99dc3dbbf6172c30e58a9) )
 ROM_END
 
-GAME( 2003, neptunp2,  0,   neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Neptune's Pearls 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year from legal registry date
-GAME( 2004, mexlindo,  0,   neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Mexico Lindo",       MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year from legal registry date
-GAME( 1999, rockroll,  0,   neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Rock 'n' Roll",      MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year taken from parts' manual and sticker on PCB
+
+/***************************************************************************
+Games on Cirsa "960606-5" PCB
+***************************************************************************/
+
+ROM_START( rockroll ) // PCB serigraphed 'CB1 (CS4)' and '960606-5 CPU'. It was found with most sockets unpopulated. This is mechanical, no GFX but a Samsung VFD.
+	ROM_REGION( 0x100000, "maincpu", 0 )
+	ROM_LOAD( "u2",   0x000000, 0x100000, NO_DUMP )
+
+	ROM_REGION( 0x100000, "prg_data", 0 )
+	ROM_LOAD( "u3",   0x000000, 0x100000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "oki", 0 )
+	ROM_LOAD( "c.rock_n_roll_b-2103_6219_otp_b-82_m27c801.u14",  0x000000, 0x100000, CRC(963d184b) SHA1(8ad8b3215d3fc513dfae27bea2ed2ae9939c0f02) )
+	ROM_LOAD( "u15",  0x100000, 0x100000, NO_DUMP ) // it's also possible it wasn't ever populated
+
+	ROM_REGION( 0x800, "eeprom", 0 )
+	ROM_LOAD( "24lc16b.u10",  0x000, 0x800, CRC(fee6b8e4) SHA1(cb0ddd23e0decda540f22ebb455c91c2aabc60fd) )
+
+	ROM_REGION( 0x104, "plds", 0 )
+	ROM_LOAD( "pat_063_tibpal16l8-25cn.bin",  0x000, 0x104, NO_DUMP ) // Protected
+ROM_END
+
+ROM_START( unk960606 ) // PCB serigraphed 'CB1 (CS4)' and '960606-5 CPU'. Like 'rockroll', it was found with most sockets unpopulated. This is mechanical.
+	ROM_REGION( 0x100000, "maincpu", 0 )
+	ROM_LOAD( "u2",   0x000000, 0x100000, NO_DUMP )
+
+	ROM_REGION( 0x100000, "prg_data", 0 )
+	ROM_LOAD( "u3",   0x000000, 0x100000, NO_DUMP )
+
+	ROM_REGION( 0x180000, "oki", 0 )
+	ROM_LOAD( "s284_otp.u14",   0x000000, 0x080000, CRC(8e385577) SHA1(c8d951b0743f6598a21e78f8c04325408c212554) )
+	ROM_LOAD( "u15",  0x080000, 0x100000, NO_DUMP ) // it's also possible it wasn't ever populated
+
+	ROM_REGION( 0x800, "eeprom", 0 )
+	ROM_LOAD( "24lc16b.u10", 0x000, 0x800, CRC(5e2d52ac) SHA1(98bc7a668ee23de4184bdef23fbceda0c1987cd7) )
+
+	ROM_REGION( 0x104, "plds", 0 )
+	ROM_LOAD( "pal16l8.u6", 0x000, 0x104, NO_DUMP )
+ROM_END
+
+
+GAME( 2003,  neptunp2,  0, neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Neptune's Pearls 2",             MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year from legal registry date
+GAME( 2004,  mexlindo,  0, neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Mexico Lindo",                   MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year from legal registry date
+
+// Games on Cirsa "960606-5" PCB
+GAME( 1999,  rockroll,  0, neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "Rock 'n' Roll",                  MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year taken from parts' manual and sticker on PCB
+GAME( 2001?, unk960606, 0, neptunp2, neptunp2, neptunp2_state, empty_init, ROT0, "Unidesa / Cirsa", "unknown 960606-5 based machine", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Year taken from sticker on PCB
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 43915b0c50c..9840bf69485 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -32227,9 +32227,10 @@ npssr2                          //
 npusagif                        //
 
 @source:neptunp2.cpp
-mexlindo                        //
-neptunp2                        //
-rockroll                        //
+mexlindo                        // (c) 2004 Cirsa / Unidesa
+neptunp2                        // (c) 2003 Cirsa / Unidesa
+rockroll                        // (c) 1999 Cirsa / Unidesa
+unk960606                       // (c) 2001? Cirsa / Unidesa
 
 @source:nes.cpp
 iq501                           // Micro Genius IQ-501