diff --git a/.gitignore b/.gitignore
index 7217f05d3d..c4789c2106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ tmp/
 
 # 3rd Party Repos
 ext/*
+
+# Microsoft IDEs
+.vs*
diff --git a/platforms.cfg b/platforms.cfg
index bab9ff53a9..a1bbb0a973 100644
--- a/platforms.cfg
+++ b/platforms.cfg
@@ -140,6 +140,10 @@ moto_fullname="Thomson MO/TO"
 n64_exts=".z64 .n64 .v64 .zip"
 n64_fullname="Nintendo 64"
 
+naomi_exts=".zip"
+naomi_fullname="NAOMI Arcade System"
+naomi_platform="arcade"
+
 nds_exts=".nds .zip"
 nds_fullname="Nintendo DS"
 
diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index 4eb716b687..007ec02f8e 100644
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -1740,4 +1740,4 @@ function signFile() {
         return 1
     fi
     return 0
-}
+}
\ No newline at end of file
diff --git a/scriptmodules/libretrocores/lr-flycast-dev.sh b/scriptmodules/libretrocores/lr-flycast-dev.sh
index 493319ab92..9171d41170 100644
--- a/scriptmodules/libretrocores/lr-flycast-dev.sh
+++ b/scriptmodules/libretrocores/lr-flycast-dev.sh
@@ -53,8 +53,9 @@ function install_lr-flycast-dev() {
 
 function configure_lr-flycast-dev() {
     local sys
+    local systems=(dreamcast naomi arcade)
     local def
-    for sys in "arcade" "dreamcast"; do
+    for sys in "${systems[@]}"; do
         def=0
         isPlatform "kms" && [[ "$sys" == "dreamcast" ]] && def=1
         # segfaults on the rpi without redirecting stdin from </dev/null
@@ -64,7 +65,7 @@ function configure_lr-flycast-dev() {
 
     [[ "$md_mode" == "remove" ]] && return
 
-    for sys in "arcade" "dreamcast"; do
+    for sys in "${systems[@]}"; do
         mkRomDir "$sys"
         defaultRAConfig "$sys"
     done
diff --git a/scriptmodules/libretrocores/lr-flycast.sh b/scriptmodules/libretrocores/lr-flycast.sh
index 21b61b7e6a..60d2844d6d 100644
--- a/scriptmodules/libretrocores/lr-flycast.sh
+++ b/scriptmodules/libretrocores/lr-flycast.sh
@@ -73,7 +73,7 @@ function install_lr-flycast() {
 
 function configure_lr-flycast() {
     local sys
-    local systems=(dreamcast arcade)
+    local systems=(dreamcast naomi arcade)
     local def
     for sys in "${systems[@]}"; do
         def=0