diff --git a/dist/info/flycast_gles2_libretro.info b/dist/info/flycast_gles2_libretro.info
index cffcd422..13d3d497 100644
--- a/dist/info/flycast_gles2_libretro.info
+++ b/dist/info/flycast_gles2_libretro.info
@@ -1,5 +1,5 @@
 # Software Information
-display_name = "Sega - Dreamcast/NAOMI (Flycast GLES2)"
+display_name = "Sega - Dreamcast/Naomi (Flycast GLES2)"
 authors = "flyinghead"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z|m3u"
 corename = "Flycast GLES2"
@@ -15,7 +15,7 @@ systemname = "Sega Dreamcast"
 systemid = "dreamcast"
 
 # Libretro Features
-database = "Sega - Dreamcast|Sega - NAOMI"
+database = "Sega - Dreamcast|Sega - Naomi"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "basic"
diff --git a/dist/info/flycast_libretro.info b/dist/info/flycast_libretro.info
index f8c9d320..a271794a 100644
--- a/dist/info/flycast_libretro.info
+++ b/dist/info/flycast_libretro.info
@@ -1,5 +1,5 @@
 # Software Information
-display_name = "Sega - Dreamcast/NAOMI (Flycast)"
+display_name = "Sega - Dreamcast/Naomi (Flycast)"
 authors = "flyinghead"
 supported_extensions = "chd|cdi|elf|bin|cue|gdi|lst|zip|dat|7z|m3u"
 corename = "Flycast"
@@ -14,7 +14,7 @@ systemname = "Sega Dreamcast"
 systemid = "dreamcast"
 
 # Libretro Features
-database = "Sega - Dreamcast|Sega - NAOMI"
+database = "Sega - Dreamcast|Sega - Naomi"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "basic"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 6b7ac389..6684f067 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -314,11 +314,14 @@ build_libretro_databases() {
 	build_libretro_database "Nintendo - Wii (Digital)" "rom.crc"
 	build_libretro_database "The 3DO Company - 3DO" "rom.crc"
 	build_libretro_database "Philips - Videopac+" "rom.crc"
+	build_libretro_database "Philips - CD-i" "rom.serial"
 	build_libretro_database "RCA - Studio II" "rom.crc"
 	build_libretro_database "Rick Dangerous" "rom.crc"
 	build_libretro_database "Sega - 32X" "rom.crc"
 	build_libretro_database "Sega - Dreamcast" "rom.serial"
 	build_libretro_database "Sega - Game Gear" "rom.crc"
+	build_libretro_database "Sega - Naomi" "rom.serial"
+	build_libretro_database "Sega - Naomi 2" "rom.serial"
 	build_libretro_database "Sega - Master System - Mark III" "rom.crc"
 	build_libretro_database "Sega - Mega-CD - Sega CD" "rom.serial"
 	build_libretro_database "Sega - Mega Drive - Genesis" "rom.crc"