diff --git a/hash/aleste.xml b/hash/aleste.xml
new file mode 100644
index 00000000000..b9537ad62ec
--- /dev/null
+++ b/hash/aleste.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ MSX-DOS + Developer Tools
+ 1993
+ Microsoft - Patisonic
+
+
+
+
+
+
+
+
+
+ Magic Sound Tracker Player
+ 1993
+ <unknown>
+
+
+
+
+
+
+
+
+
+ MSX Games
+ 19??
+ <unknown>
+
+
+
+
+
+
+
+
+
diff --git a/hash/einstein.xml b/hash/einstein.xml
index a4f9832304f..ca2e1428383 100644
--- a/hash/einstein.xml
+++ b/hash/einstein.xml
@@ -142,11 +142,9 @@ Superstore (Kuma)
Superwriter (Softsel)
Tasprint Einstein (Tasman)
Tassign Einstein (Tasman)
-Tasword Einstein (Tasman)
Telepack (New Miracle Software)
Telerenter (New Miracle Software)
The Accounting System (Surrey Software)
-The Cracker (Tatung)
The New DATAFILE 11 (Fydler)
Total Business Package (Solo Software)
Use it (Bubble Bus)
@@ -179,23 +177,16 @@ Heli Maths/Function Machine (Screensoft)
Mathemagic/Scoop (Solo Software)
Maths Tank/Counter Blast (Solo Software)
Microtext (Transdata Ltd)
-Mr Fixit/Get Lost (Solo Software)
Modern Maths 16+/Chock A Block (Solo Software)
-Traditional Maths 16+/Cyfax (Solo Software)
T.N.T (Ten not Two) - J&K Software
Spell N Build/Word Search (Screensoft)
Games:
-256 Games Pack for Einstein 256 (Merlin)
3D Noughts and Crosses (Solo Software)
-Agrovator (Syntaxsoft)
-Alice and the March Hare (Orion)
Attack of the Killer Tomatoes (Merlin)
Ballyhoo (Infocom)
Batman (Ocean)
Beach Head 1 + 2 (Tatung)
-Bell Super Six Games (Bell Software)
-Bell Super 10 Games (Bell Software)
Buzz Off/Shark Hunter (Electric Software)
Card Sharp (Emsoft)
Casino (Emsoft)
@@ -212,12 +203,10 @@ Dragon's Lair (Merlin/Software Projects)
Einjong (Merlin)
Eliminator/Reversi (Merlin)
Family Pack 1 (Solo Software)
-Fathom's Deep (Merlin)
Flight Path 737 (Anirog)
Flight Simulation (Screensoft)
Football Manager/Pinball (Sharward Services)
Football Pools Predictor (Bell Software)
-Fruckles/Toado (Merlin)
Fydler Six Game Pack (P.C.S)
Games Night (Emsoft)
Gloop (Merlin)
@@ -234,28 +223,20 @@ Kid's Stuff (Merlin)
Knight Lore (Tatung/Ultimate)
Le Mans (Electric Software)
Les Flics (Electric Software)
-Manik Panik/Galaxoids (Solo Software)
Mayhem (Solo Software)
Merlin Games Compendium (Merlin)
Norseman/Backgammon (Electric Software)
One man and his droid (Tatung)
-Pakman/Millipede (Kuma)
-Panzer Attack (Lothlorian)
Planetfall (Infocom)
Polaris (Solo Software)
Punchy (Tatung Einsoft)
-Quantum (Merlin)
Reversi (Merlin)
-River Bandit (Merlin)
-Roverball (Merlin)
Seastalker (Infocom)
Soho (Emsoft)
Sorcerer (Infocom)
Soul of a Robot/F1 Simulator (Merlin)
-Southern Belle (Merlin)
Space Traveller/Reversi (Merlin)
Speculator Disks 1,2 and 3 (Syntaxsoft)
-Spellbreaker (Infocom)
Sprog (Merlin)
Starbase (Merlin)
Stock Tycoon (Screensoft)
@@ -265,11 +246,8 @@ The Kingdom in Chess (Fydler)
Time Bandits (Orion)
Tracker (Solo Software)
Turbo Chess/Draughts (Screensoft)
-Wishbringer (Infocom)
Witness (Infocom)
Zexl (Everco)
-Zork 1 (Infocom)
-Zork 3 (Infocom)
Programming:
Assembler Plus
@@ -335,7 +313,6 @@ Backup (Xitan)
Bankmate (Fydler)
British Football Pools Predictor (Bell)
CAD-CAM (Skytronics)
-Colour Fantasia (Kuma)
Config (Merlin)
CCT/PCB Design (Taurus)
Data Diary (Phoenix)
@@ -372,7 +349,6 @@ Menu Manager
Merlin Transfer (Merlin)
Microsoft Sorting Utility (Softsel)
Microstat (Xitan)
-Mouse Art (Emsoft)
Neil's Utilities (Merlin)
PC Utility (Taurus)
Pertmaster (Xitan)
@@ -414,6 +390,39 @@ Xtal Systems (Xtal Research)
+
+ 256 Games Pack for Einstein 256
+ 1986
+ Merlin Software
+
+
+
+
+
+
+
+
+ Agrovator
+ 19??
+ Syntaxsoft
+
+
+
+
+
+
+
+
+ Alice and the March Hare
+ 1986
+ Orion Software
+
+
+
+
+
+
+
Assembly Language Course
@@ -492,6 +501,28 @@ Xtal Systems (Xtal Research)
+
+ Colour Fantasia
+ 1984
+ Kuma
+
+
+
+
+
+
+
+
+ The Cracker (v2.31c)
+ 1985
+ Tatung
+
+
+
+
+
+
+
Cursed Chambers & ZRIM
19??
@@ -503,6 +534,17 @@ Xtal Systems (Xtal Research)
+
+ Cursed Chambers & ZRIM (Alt)
+ 19??
+ Kuma Software
+
+
+
+
+
+
+
Dan Diamond Trilogy
19??
@@ -570,6 +612,17 @@ Xtal Systems (Xtal Research)
+
+ Einstein Compendium
+ 19??
+ Emsoft
+
+
+
+
+
+
+
Einstein Micro Plox
1989
@@ -603,6 +656,17 @@ Xtal Systems (Xtal Research)
+
+ Fathom's Deep
+ 19??
+ Merlin Software
+
+
+
+
+
+
+
Flight Simulation
1985
@@ -636,6 +700,17 @@ Xtal Systems (Xtal Research)
+
+ Get Lost & Mr Fixit
+ 1984
+ Solo Software
+
+
+
+
+
+
+
Gronks
198?
@@ -647,6 +722,17 @@ Xtal Systems (Xtal Research)
+
+ Heli-Maths
+ 1985
+ Screensoft
+
+
+
+
+
+
+
Highway Encounter
1985
@@ -704,8 +790,7 @@ Xtal Systems (Xtal Research)
-
- Kuma Disc Utility
+ Kuma Disc Utility (v1.0)
19??
Kuma Software
@@ -748,6 +833,17 @@ Xtal Systems (Xtal Research)
+
+ Manik Panik & Galaxoids
+ 19??
+ Solo Software
+
+
+
+
+
+
+
Mathe-Magic & Scoop
19??
@@ -781,6 +877,17 @@ Xtal Systems (Xtal Research)
+
+ Miner Dick
+ 1984
+ Merlin Software
+
+
+
+
+
+
+
Monopoly
19??
@@ -792,6 +899,17 @@ Xtal Systems (Xtal Research)
+
+ Mouse Art
+ 19??
+ Emsoft
+
+
+
+
+
+
+
Music Composer
1984
@@ -814,6 +932,17 @@ Xtal Systems (Xtal Research)
+
+ Music Workshop (Alt)
+ 19??
+ Screensoft
+
+
+
+
+
+
+
Nightmare Park & Commando Plain
19??
@@ -836,6 +965,28 @@ Xtal Systems (Xtal Research)
+
+ Pakman & Millipede
+ 198?
+ Kuma Software
+
+
+
+
+
+
+
+
+ Panzer Attack
+ 1985
+ Lothlorien
+
+
+
+
+
+
+
Pete's Utilities
19??
@@ -869,6 +1020,28 @@ Xtal Systems (Xtal Research)
+
+ Quantum
+ 19??
+ Merlin Software
+
+
+
+
+
+
+
+
+ River Bandits
+ 19??
+ Merlin Software
+
+
+
+
+
+
+
Rocket / Giant Maths / Mighty Writer
19??
@@ -880,6 +1053,17 @@ Xtal Systems (Xtal Research)
+
+ Roverball
+ 19??
+ Merlin Software
+
+
+
+
+
+
+
Qoko 2
19??
@@ -913,6 +1097,17 @@ Xtal Systems (Xtal Research)
+
+ Southern Belle
+ 19??
+ Merlin Software
+
+
+
+
+
+
+
Space Trap
1985
@@ -935,6 +1130,17 @@ Xtal Systems (Xtal Research)
+
+ Spectrum Emulator Disk 1
+ 19??
+ Syntaxsoft
+
+
+
+
+
+
+
Spell n' Build
19??
@@ -946,6 +1152,17 @@ Xtal Systems (Xtal Research)
+
+ Spellbreaker
+ 1985
+ Infocom
+
+
+
+
+
+
+
Spreadsheet
1984
@@ -1002,8 +1219,7 @@ Xtal Systems (Xtal Research)
-
- SuperFORTH
+ SuperFORTH (v1.12)
1984
Tatung Einsoft
@@ -1013,8 +1229,8 @@ Xtal Systems (Xtal Research)
-
- Super Six Game Pack
+
+ Super Six Game Pack (Tatung)
198?
Tatung Einsoft
@@ -1024,6 +1240,28 @@ Xtal Systems (Xtal Research)
+
+ Super Six Game Pack (Tatung, Alt)
+ 198?
+ Tatung Einsoft
+
+
+
+
+
+
+
+
+ Super 6 Games (Bell)
+ 19??
+ Bell Software
+
+
+
+
+
+
+
Superstore
19??
@@ -1090,50 +1328,6 @@ Xtal Systems (Xtal Research)
-
- Tombs of Karnak & Encounter
- 19??
- Solo Software
-
-
-
-
-
-
-
-
- Tycoon & Pelmanism
- 198?
- Kuma Software
-
-
-
-
-
-
-
-
- Xanagrams & Quadrax
- 19??
- Kuma Software
-
-
-
-
-
-
-
-
- Xtaldos 1.31
- 198?
- Tatung
-
-
-
-
-
-
-
Theatre Europe
19??
@@ -1156,6 +1350,28 @@ Xtal Systems (Xtal Research)
+
+ Toado & Fruckles
+ 1986
+ Syntaxsoft
+
+
+
+
+
+
+
+
+ Tombs of Karnak & Encounter
+ 19??
+ Solo Software
+
+
+
+
+
+
+
Tournament Snooker
198?
@@ -1167,6 +1383,39 @@ Xtal Systems (Xtal Research)
+
+ Traditional 16+ Maths & Cyfax
+ 198?
+ Solo Software
+
+
+
+
+
+
+
+
+ Tycoon & Pelmanism
+ 198?
+ Kuma Software
+
+
+
+
+
+
+
+
+ Wishbringer
+ 19??
+ Infocom
+
+
+
+
+
+
+
Word Processor 40
19??
@@ -1200,6 +1449,28 @@ Xtal Systems (Xtal Research)
+
+ Xanagrams & Quadrax
+ 19??
+ Kuma Software
+
+
+
+
+
+
+
+
+ Xtaldos 1.31
+ 198?
+ Tatung
+
+
+
+
+
+
+
Zen Editor/Assembler
@@ -1212,86 +1483,186 @@ Xtal Systems (Xtal Research)
-
- Zork 2
- 19??
+
+ Zork I - The Great Underground Empire
+ 198?
Infocom
-
+
-
-
-
- Ski-Jump & Nubble Trubble
- 19??
- Mario Castro
-
-
-
-
-
-
+
+ 100 Metres Sprint & Karate
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
-
- Star Trek
- 19??
- Mario Castro
-
-
-
-
-
-
+
+ Conan & Boxing
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
-
- Sword Feud
- 198?
- A.C.E. Software
-
-
-
-
-
-
+
+ Lottery
+ 2005
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Ski-Jump & Nubble Trubble
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Star Trek
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
+
+
+
+ Sword Feud
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ BBC BASIC (v2.31)
+ 1984?
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Einstein Disk International 1
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Einstein Disk International 2
+ 19??
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Einstein Disk International 3
+ 198?
+ <homebrew>
+
+
+
+
+
+
+
+
+
+ Game Compilation (Cracked)
+ 19??
+ <unknown>
+
+
+
+
+
+
+
+
+ Steam Computer Software Volume 22 (v1.05)
+ 1983
+ <homebrew>
+
+
+
+
+
+
+
+
+
--->
-
\ No newline at end of file
diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c
index 5c4fc53a98d..34940c18f96 100644
--- a/src/mess/drivers/amstrad.c
+++ b/src/mess/drivers/amstrad.c
@@ -1069,6 +1069,10 @@ static MACHINE_CONFIG_DERIVED( aleste, amstrad )
MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "525hd", floppy_image_device::default_floppy_formats)
+ MCFG_DEVICE_REMOVE("flop_list")
+ MCFG_SOFTWARE_LIST_ADD("flop_list", "aleste")
+ MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cpc_list", "cpc_flop")
+
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")