diff --git a/dist/info/beetle_psx_libretro.info b/dist/info/beetle_psx_libretro.info
index 856acc3b..c109802a 100644
--- a/dist/info/beetle_psx_libretro.info
+++ b/dist/info/beetle_psx_libretro.info
@@ -9,6 +9,7 @@ license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36.3"
 supports_no_game = "false"
+database = "Sony - PlayStation"
 firmware_count = 3
 firmware0_desc = "scph5500.bin (PS1 JP BIOS)"
 firmware0_path = "scph5500.bin"
diff --git a/dist/info/bluemsx_libretro.info b/dist/info/bluemsx_libretro.info
index 2e112a39..26074426 100644
--- a/dist/info/bluemsx_libretro.info
+++ b/dist/info/bluemsx_libretro.info
@@ -6,6 +6,7 @@ manufacturer = "Various"
 categoryname = "Emulator"
 systemname = "MSX/SVI/ColecoVision/SG-1000"
 license = "GPLv2"
+database = "Microsoft - MSX|Microsoft - MSX 2"
 permissions = ""
 display_version = "svn"
 supports_no_game = "false"
diff --git a/dist/info/bnes_libretro.info b/dist/info/bnes_libretro.info
index 5fd159ca..1becc311 100644
--- a/dist/info/bnes_libretro.info
+++ b/dist/info/bnes_libretro.info
@@ -5,6 +5,7 @@ corename = "bNES/higan"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System"
 license = "GPLv3"
 permissions = ""
 display_version = "v083"
diff --git a/dist/info/bsnes_accuracy_libretro.info b/dist/info/bsnes_accuracy_libretro.info
index 1e7ea826..b02c4fe3 100644
--- a/dist/info/bsnes_accuracy_libretro.info
+++ b/dist/info/bsnes_accuracy_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes/higan Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Accuracy)"
diff --git a/dist/info/bsnes_balanced_libretro.info b/dist/info/bsnes_balanced_libretro.info
index 964de470..75551b7f 100644
--- a/dist/info/bsnes_balanced_libretro.info
+++ b/dist/info/bsnes_balanced_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes/higan Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Balanced)"
diff --git a/dist/info/bsnes_cplusplus98_libretro.info b/dist/info/bsnes_cplusplus98_libretro.info
index 6152f779..95bbba45 100644
--- a/dist/info/bsnes_cplusplus98_libretro.info
+++ b/dist/info/bsnes_cplusplus98_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes C++98 (v085)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v085 (Performance)"
diff --git a/dist/info/bsnes_mercury_accuracy_libretro.info b/dist/info/bsnes_mercury_accuracy_libretro.info
index 6338c73b..0ce91a53 100644
--- a/dist/info/bsnes_mercury_accuracy_libretro.info
+++ b/dist/info/bsnes_mercury_accuracy_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes-mercury Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Mercury Accuracy)"
diff --git a/dist/info/bsnes_mercury_balanced_libretro.info b/dist/info/bsnes_mercury_balanced_libretro.info
index 54145032..0725d74e 100644
--- a/dist/info/bsnes_mercury_balanced_libretro.info
+++ b/dist/info/bsnes_mercury_balanced_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes-mercury Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Mercury Balanced)"
diff --git a/dist/info/bsnes_mercury_performance_libretro.info b/dist/info/bsnes_mercury_performance_libretro.info
index cdc629ce..96e7f288 100644
--- a/dist/info/bsnes_mercury_performance_libretro.info
+++ b/dist/info/bsnes_mercury_performance_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes-mercury Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Mercury Performance)"
diff --git a/dist/info/bsnes_performance_libretro.info b/dist/info/bsnes_performance_libretro.info
index 9adad42f..7aecfd80 100644
--- a/dist/info/bsnes_performance_libretro.info
+++ b/dist/info/bsnes_performance_libretro.info
@@ -5,6 +5,7 @@ corename = "bsnes/higan Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
 display_version = "v094 (Performance)"
diff --git a/dist/info/catsfc_libretro.info b/dist/info/catsfc_libretro.info
index 7e07bdd5..e5664f26 100644
--- a/dist/info/catsfc_libretro.info
+++ b/dist/info/catsfc_libretro.info
@@ -5,6 +5,7 @@ corename = "CATSFC"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
 display_version = "v1.36"
diff --git a/dist/info/desmume_libretro.info b/dist/info/desmume_libretro.info
index 7bde0bfe..f660b420 100644
--- a/dist/info/desmume_libretro.info
+++ b/dist/info/desmume_libretro.info
@@ -5,6 +5,7 @@ corename = "DeSmuME"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
+database = "Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play) (BETA)"
 license = "GPLv2"
 permissions = ""
 display_version = "svn"
diff --git a/dist/info/emux_gb_libretro.info b/dist/info/emux_gb_libretro.info
index 15ec0786..0d415f62 100644
--- a/dist/info/emux_gb_libretro.info
+++ b/dist/info/emux_gb_libretro.info
@@ -5,6 +5,7 @@ corename = "Emux GB"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/emux_nes_libretro.info b/dist/info/emux_nes_libretro.info
index 103cdd68..4fd5fced 100644
--- a/dist/info/emux_nes_libretro.info
+++ b/dist/info/emux_nes_libretro.info
@@ -5,6 +5,7 @@ corename = "Emux NES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/emux_sms_libretro.info b/dist/info/emux_sms_libretro.info
index f0abc7b0..7645505a 100644
--- a/dist/info/emux_sms_libretro.info
+++ b/dist/info/emux_sms_libretro.info
@@ -5,6 +5,7 @@ corename = "Emux SMS"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Master System"
+database = "Sega - Master System - Mark III.rdb"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/fceumm_libretro.info b/dist/info/fceumm_libretro.info
index 4f8769f0..1a7c50c3 100644
--- a/dist/info/fceumm_libretro.info
+++ b/dist/info/fceumm_libretro.info
@@ -5,6 +5,7 @@ corename = "FCEUmm"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
 license = "GPLv2"
 permissions = ""
 firmware_count = 1
diff --git a/dist/info/fmsx_libretro.info b/dist/info/fmsx_libretro.info
index 57af06d0..da6954c6 100644
--- a/dist/info/fmsx_libretro.info
+++ b/dist/info/fmsx_libretro.info
@@ -5,6 +5,7 @@ corename = "fMSX"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MSX"
+database = "Microsoft - MSX|Microsoft - MSX 2"
 license = "Non-commercial"
 permissions = ""
 display_version = "3.9"
diff --git a/dist/info/gambatte_libretro.info b/dist/info/gambatte_libretro.info
index 4c6aeaf8..34369916 100644
--- a/dist/info/gambatte_libretro.info
+++ b/dist/info/gambatte_libretro.info
@@ -5,6 +5,7 @@ corename = "Gambatte"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.5.0"
diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info
index c548692a..4c7c33a6 100644
--- a/dist/info/genesis_plus_gx_libretro.info
+++ b/dist/info/genesis_plus_gx_libretro.info
@@ -5,6 +5,7 @@ corename = "Genesis Plus GX"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega 8/16bit (Various)"
+database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
 license = "Non-commercial"
 permissions = ""
 display:version = "v1.7.4"
diff --git a/dist/info/gpsp_libretro.info b/dist/info/gpsp_libretro.info
index 5efce318..142a1c40 100644
--- a/dist/info/gpsp_libretro.info
+++ b/dist/info/gpsp_libretro.info
@@ -5,6 +5,7 @@ corename = "gpSP"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "git"
diff --git a/dist/info/handy_libretro.info b/dist/info/handy_libretro.info
index 593f5ac5..aab006a9 100644
--- a/dist/info/handy_libretro.info
+++ b/dist/info/handy_libretro.info
@@ -5,6 +5,7 @@ corename = "Handy"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari Lynx"
+database = "Atari - Lynx"
 license = "Zlib"
 permissions = ""
 display_version = "0.95"
diff --git a/dist/info/mednafen_gba_libretro.info b/dist/info/mednafen_gba_libretro.info
index 27e208fd..d0810d4c 100644
--- a/dist/info/mednafen_gba_libretro.info
+++ b/dist/info/mednafen_gba_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle GBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36"
diff --git a/dist/info/mednafen_lynx_libretro.info b/dist/info/mednafen_lynx_libretro.info
index 049a02bb..1f4ba6ee 100644
--- a/dist/info/mednafen_lynx_libretro.info
+++ b/dist/info/mednafen_lynx_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen Lynx"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari Lynx"
+database = "Atari - Lynx"
 license = "Zlib|GPLv2"
 permissions = ""
 display_version = "v0.9.32"
diff --git a/dist/info/mednafen_ngp_libretro.info b/dist/info/mednafen_ngp_libretro.info
index 91a1988d..9f271bfc 100644
--- a/dist/info/mednafen_ngp_libretro.info
+++ b/dist/info/mednafen_ngp_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle NeoPop"
 manufacturer = "SNK"
 categories = "Emulator"
 systemname = "Neo Geo Pocket (Color)"
+database = "SNK - Neo Geo Pocket|SNK - Neo Geo Pocket Color"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36.1"
diff --git a/dist/info/mednafen_pce_fast_libretro.info b/dist/info/mednafen_pce_fast_libretro.info
index 33979528..010e4b5c 100644
--- a/dist/info/mednafen_pce_fast_libretro.info
+++ b/dist/info/mednafen_pce_fast_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle PCE FAST"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC Engine/PCE-CD"
+database = "NEC - PC Engine - TurboGrafx 16"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36.1"
diff --git a/dist/info/mednafen_snes_libretro.info b/dist/info/mednafen_snes_libretro.info
index 6ee2f17f..40da6a79 100644
--- a/dist/info/mednafen_snes_libretro.info
+++ b/dist/info/mednafen_snes_libretro.info
@@ -4,6 +4,7 @@ corename = "Mednafen/Beetle bSNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.26"
diff --git a/dist/info/mednafen_supergrafx_libretro.info b/dist/info/mednafen_supergrafx_libretro.info
index bea66210..3af076f1 100644
--- a/dist/info/mednafen_supergrafx_libretro.info
+++ b/dist/info/mednafen_supergrafx_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle SGX"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC Engine SuperGrafx"
+database = "NEC - Super Grafx"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36"
diff --git a/dist/info/mednafen_vb_libretro.info b/dist/info/mednafen_vb_libretro.info
index d0764737..f7a1dc0a 100644
--- a/dist/info/mednafen_vb_libretro.info
+++ b/dist/info/mednafen_vb_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle VB"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Virtual Boy"
+database = "Nintendo - Virtual Boy"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.36.1"
diff --git a/dist/info/mednafen_wswan_libretro.info b/dist/info/mednafen_wswan_libretro.info
index 560c4b85..9be05fb1 100644
--- a/dist/info/mednafen_wswan_libretro.info
+++ b/dist/info/mednafen_wswan_libretro.info
@@ -5,6 +5,7 @@ corename = "Mednafen/Beetle WonderSwan"
 manufacturer = "Bandai"
 categories = "Emulator"
 systemname = "WonderSwan/Color"
+database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.35.1"
diff --git a/dist/info/meteor_libretro.info b/dist/info/meteor_libretro.info
index 4e630bcc..fd55fe13 100644
--- a/dist/info/meteor_libretro.info
+++ b/dist/info/meteor_libretro.info
@@ -5,6 +5,7 @@ corename = "Meteor"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv3"
 permissions = ""
 display_version = "v1.4"
diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info
index b99ed538..18e78fa5 100644
--- a/dist/info/mupen64plus_libretro.info
+++ b/dist/info/mupen64plus_libretro.info
@@ -4,6 +4,7 @@ corename = "Mupen64Plus"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
+database = "Nintendo - Nintendo 64"
 license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "2.0-rc2"
diff --git a/dist/info/nestopia_libretro.info b/dist/info/nestopia_libretro.info
index 28ec46b9..5645fec5 100644
--- a/dist/info/nestopia_libretro.info
+++ b/dist/info/nestopia_libretro.info
@@ -5,6 +5,7 @@ corename = "Nestopia"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
 license = "GPLv2"
 permissions = ""
 display_version = "v1.46.2"
diff --git a/dist/info/o2em_libretro.info b/dist/info/o2em_libretro.info
index a72d576d..c165690a 100644
--- a/dist/info/o2em_libretro.info
+++ b/dist/info/o2em_libretro.info
@@ -5,6 +5,7 @@ corename = "O2EM"
 manufacturer = "Magnavox|Philips"
 categories = "Emulator"
 systemname = "Magnavox Odyssey 2/VideoPac"
+database = "Magnavox - Odyssey2"
 license = "Artistic License"
 permissions = ""
 display_version = "1.18"
diff --git a/dist/info/pcsx_rearmed_interpreter_libretro.info b/dist/info/pcsx_rearmed_interpreter_libretro.info
index f453cc96..6b9fc7cc 100644
--- a/dist/info/pcsx_rearmed_interpreter_libretro.info
+++ b/dist/info/pcsx_rearmed_interpreter_libretro.info
@@ -5,6 +5,7 @@ corename = "PCSX ReARMed [Interpreter]"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
+database = "Sony - PlayStation"
 license = "GPLv2"
 firmware_count = 3
 firmware0_desc = "scph5500.bin (PS1 JP BIOS)"
diff --git a/dist/info/pcsx_rearmed_libretro.info b/dist/info/pcsx_rearmed_libretro.info
index 5ae7f5c4..c9692e76 100644
--- a/dist/info/pcsx_rearmed_libretro.info
+++ b/dist/info/pcsx_rearmed_libretro.info
@@ -7,6 +7,7 @@ categories = "Emulator"
 systemname = "PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
+database = "Sony - PlayStation"
 display_version = "r19"
 supports_no_game = "false"
 firmware_count = 3
diff --git a/dist/info/pcsx_rearmed_libretro_neon.info b/dist/info/pcsx_rearmed_libretro_neon.info
index 7c043d68..5d8dfedf 100644
--- a/dist/info/pcsx_rearmed_libretro_neon.info
+++ b/dist/info/pcsx_rearmed_libretro_neon.info
@@ -7,6 +7,7 @@ categories = "Emulator"
 systemname = "PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
+database = "Sony - PlayStation"
 display_version = "r19"
 supports_no_game = "false"
 firmware_count = 3
diff --git a/dist/info/picodrive_libretro.info b/dist/info/picodrive_libretro.info
index cd14c9aa..49e37585 100644
--- a/dist/info/picodrive_libretro.info
+++ b/dist/info/picodrive_libretro.info
@@ -7,6 +7,7 @@ categories = "Emulator"
 systemname = "Sega 16-bit + 32X (Various)"
 license = "MAME"
 permissions = "dynarec_optional"
+database = "Sega - Mega Drive - Genesis|Sega - 32X"
 display_version = "1.91"
 supports_no_game = "false"
 firmware_count = 3
diff --git a/dist/info/pocketsnes_libretro.info b/dist/info/pocketsnes_libretro.info
index 8fe92e86..cb7c70a9 100644
--- a/dist/info/pocketsnes_libretro.info
+++ b/dist/info/pocketsnes_libretro.info
@@ -5,5 +5,6 @@ corename = "PocketSNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/ppsspp_libretro.info b/dist/info/ppsspp_libretro.info
index 776e373c..55a4a05b 100644
--- a/dist/info/ppsspp_libretro.info
+++ b/dist/info/ppsspp_libretro.info
@@ -5,6 +5,7 @@ corename = "PPSSPP"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PSP"
+database = "Sony - PlayStation Portable"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.9.1"
diff --git a/dist/info/prosystem_libretro.info b/dist/info/prosystem_libretro.info
index ccaa1c63..f049c541 100644
--- a/dist/info/prosystem_libretro.info
+++ b/dist/info/prosystem_libretro.info
@@ -5,6 +5,7 @@ corename = "ProSystem"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 7800"
+database = "Atari - 7800"
 license = "GPLv2"
 permissions = ""
 display_version = "1.3e"
diff --git a/dist/info/quicknes_libretro.info b/dist/info/quicknes_libretro.info
index b76f1902..50e5a963 100644
--- a/dist/info/quicknes_libretro.info
+++ b/dist/info/quicknes_libretro.info
@@ -5,6 +5,7 @@ corename = "QuickNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
 license = "LGPLv2.1+"
 permissions = ""
 display_version = "v1"
diff --git a/dist/info/snes9x_libretro.info b/dist/info/snes9x_libretro.info
index c416de0b..7aab157c 100644
--- a/dist/info/snes9x_libretro.info
+++ b/dist/info/snes9x_libretro.info
@@ -5,6 +5,7 @@ corename = "SNES9x"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
 display_version = "1.53"
diff --git a/dist/info/snes9x_next_libretro.info b/dist/info/snes9x_next_libretro.info
index f682e004..65ceeebc 100644
--- a/dist/info/snes9x_next_libretro.info
+++ b/dist/info/snes9x_next_libretro.info
@@ -5,6 +5,7 @@ corename = "SNES9x Next"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
 display_version = "v1.52.4"
diff --git a/dist/info/stella_libretro.info b/dist/info/stella_libretro.info
index 871aa700..37c486c6 100644
--- a/dist/info/stella_libretro.info
+++ b/dist/info/stella_libretro.info
@@ -5,6 +5,7 @@ corename = "Stella"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 2600"
+database = "Atari - 2600"
 license = "GPLv2"
 permissions = ""
 display_version = "3.9.3"
diff --git a/dist/info/tempgba_libretro.info b/dist/info/tempgba_libretro.info
index 737bdbae..46c8b01d 100644
--- a/dist/info/tempgba_libretro.info
+++ b/dist/info/tempgba_libretro.info
@@ -5,6 +5,7 @@ corename = "TempGBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "26731013"
diff --git a/dist/info/tgbdual_libretro.info b/dist/info/tgbdual_libretro.info
index 67d055a4..31f7d03d 100644
--- a/dist/info/tgbdual_libretro.info
+++ b/dist/info/tgbdual_libretro.info
@@ -5,6 +5,7 @@ corename = "TGB Dual"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.8.3"
diff --git a/dist/info/vba_next_libretro.info b/dist/info/vba_next_libretro.info
index 1b5ae9da..843fbb41 100644
--- a/dist/info/vba_next_libretro.info
+++ b/dist/info/vba_next_libretro.info
@@ -5,6 +5,7 @@ corename = "VBA Next"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "svn"
diff --git a/dist/info/vbam_libretro.info b/dist/info/vbam_libretro.info
index ad37ea48..e1f34dd8 100644
--- a/dist/info/vbam_libretro.info
+++ b/dist/info/vbam_libretro.info
@@ -5,6 +5,7 @@ corename = "VBA-M"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "svn"
diff --git a/dist/info/vecx_libretro.info b/dist/info/vecx_libretro.info
index bc218033..1ec0e611 100644
--- a/dist/info/vecx_libretro.info
+++ b/dist/info/vecx_libretro.info
@@ -5,6 +5,7 @@ corename = "vecx"
 manufacturer = "Smith Engineering|General Consumer Electronics"
 categories = "Emulator"
 systemname = "Vectrex"
+database = "GCE - Vectrex"
 license = "GPLv2|LGPLv2.1"
 permissions = ""
 display_version = "svn"
diff --git a/dist/info/virtualjaguar_libretro.info b/dist/info/virtualjaguar_libretro.info
index e50ef882..2112b0b4 100644
--- a/dist/info/virtualjaguar_libretro.info
+++ b/dist/info/virtualjaguar_libretro.info
@@ -5,6 +5,7 @@ corename = "Virtual Jaguar"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Jaguar"
+database = "Atari - Jaguar"
 license = "GPLv3"
 permissions = ""
 display_version = "v2.1.0"
diff --git a/dist/info/yabause_libretro.info b/dist/info/yabause_libretro.info
index 7184d8c2..0374ebb4 100644
--- a/dist/info/yabause_libretro.info
+++ b/dist/info/yabause_libretro.info
@@ -5,6 +5,7 @@ corename = "Yabause"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Saturn"
+database = "Sega - Saturn"
 license = "GPLv2"
 display_version = "v0.9.14"
 supports_no_game = "false"