diff --git a/dist/info/fake08_libretro.info b/dist/info/fake08_libretro.info
index 29560957c..4e4745400 100644
--- a/dist/info/fake08_libretro.info
+++ b/dist/info/fake08_libretro.info
@@ -1,5 +1,5 @@
 # Software Information
-display_name = "Pico-8 (FAKE-08)"
+display_name = "PICO-8 (FAKE-08)"
 authors = "jtothebell"
 supported_extensions = "p8|png"
 corename = "FAKE-08"
@@ -10,10 +10,11 @@ display_version = "v0.0.2.19"
 
 # Hardware Information
 manufacturer = "Lexaloffle"
-systemname = "Pico-8"
+systemname = "PICO-8"
 systemid = "pico8"
 
 # Libretro Features
+database = "PICO-8"
 supports_no_game = "true"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/dist/info/retro8_libretro.info b/dist/info/retro8_libretro.info
index 3c593d732..87cc2d793 100644
--- a/dist/info/retro8_libretro.info
+++ b/dist/info/retro8_libretro.info
@@ -10,12 +10,12 @@ categories = "Emulator"
 
 # Hardware Information
 manufacturer = "Lexaloffle"
-systemname = "PICO8"
+systemname = "PICO-8"
 systemid = "pico8"
 
 # Libretro Features
+database = "PICO-8"
 supports_no_game = "false"
-database = "PICO8"
 savestate = "false"
 
 description = "A port of the Retro8 open-source reimplementation of the PICO-8 fantasy console to libretro. This core can load both p8 'cart' files and embedded png images, and much of the PICO-8 API is working with good performance, including basic sound and music, though it is still missing some obscure Lua extension quirks and fixed arithmetic support."
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index b3ee2af41..0f1cfee9a 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -379,6 +379,7 @@ build_libretro_databases() {
 	build_libretro_database "Vircon32" "rom.crc"
 	build_libretro_database "MicroW8" "rom.crc"
 	build_libretro_database "Spectravideo - SVI-318 - SVI-328" "rom.crc"
+	build_libretro_database "PICO-8" "rom.crc"
 }
 
 build_libretrodb