diff --git a/dist/info/cdi2015_libretro.info b/dist/info/cdi2015_libretro.info
index acb76699..01846178 100644
--- a/dist/info/cdi2015_libretro.info
+++ b/dist/info/cdi2015_libretro.info
@@ -21,7 +21,7 @@ firmware0_opt = "false"
 
 # Libretro Features
 supports_no_game = "false"
-database = ""
+database = "Philips - CD-i"
 savestate = "false"
 savestate_features = "null"
 cheats = "false"
diff --git a/dist/info/same_cdi_libretro.info b/dist/info/same_cdi_libretro.info
index ca196a4e..b9d02b84 100644
--- a/dist/info/same_cdi_libretro.info
+++ b/dist/info/same_cdi_libretro.info
@@ -15,7 +15,7 @@ systemid = "cdi"
 
 # Libretro Features
 supports_no_game = "false"
-database = "MAME"
+database = "MAME|Philips - CD-i"
 savestate = "false"
 savestate_features = "null"
 cheats = "false"
diff --git a/dist/info/uae4arm_libretro.info b/dist/info/uae4arm_libretro.info
index 628092f9..4609b817 100644
--- a/dist/info/uae4arm_libretro.info
+++ b/dist/info/uae4arm_libretro.info
@@ -15,6 +15,7 @@ systemname = "Amiga"
 systemid = "commodore_amiga"
 
 # Libretro Features
+database = "Commodore - Amiga|Commodore - CD32|Commodore - CDTV"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/dist/info/x1_libretro.info b/dist/info/x1_libretro.info
index a48782ac..81e99f41 100644
--- a/dist/info/x1_libretro.info
+++ b/dist/info/x1_libretro.info
@@ -14,7 +14,7 @@ systemname = "Sharp X1"
 systemid = "sharp_x1"
 
 # Libretro Features
-database = "Sharp X1"
+database = "Sharp - X1"
 supports_no_game = "false"
 
 # BIOS / Firmware
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index e6c63181..81c4a003 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -302,7 +302,7 @@ build_libretro_databases() {
 	build_libretro_database "NEC - PC Engine - TurboGrafx 16" "rom.crc"
 	build_libretro_database "NEC - PC Engine SuperGrafx" "rom.crc"
 	build_libretro_database "NEC - PC-FX" "rom.crc"
-	build_libretro_database "NEC - PC-98" "rom.serial"
+	build_libretro_database "NEC - PC-98" "rom.crc"
 	build_libretro_database "NEC - PC-8001 - PC-8801" "rom.crc"
 	build_libretro_database "Nintendo - Family Computer Disk System" "rom.crc"
 	build_libretro_database "Nintendo - Game Boy" "rom.crc"