diff --git a/emulators/fsuae.yml b/emulators/fsuae.yml
index bea536fb4..5f50e2793 100644
--- a/emulators/fsuae.yml
+++ b/emulators/fsuae.yml
@@ -5,7 +5,7 @@ source: "https://github.com/libretro/libretro-fsuae"
 upstream: "https://github.com/FrodeSolheim/fs-uae"
 profiled_date: "2026-03-26"
 source_commit: "089bb69207fe8fa5eec0006d1d759fb6426f4027"
-upstream_commit: "f362278ccd4c60991caac3b4d240d4a3f751bea2"
+upstream_commit: "79ac88e3727ee4d35d964aa07ad78894b844da27"
 core_version: "5.0.7"
 version_basis:
   kind: file
@@ -23,15 +23,15 @@ systems:
 data_root:
   windows:
     path: "%APPDATA%/FS-UAE/Data"
-    source_ref: "od-fs/fsuae/fsuae-init.c:75-82, 84-117"
+    source_ref: "od-fs/fsuae/fsuae-init.c:81-88, od-fs/fsuae/fsuae-init.c:90-123"
     note: "A Portable.ini starting with # FS-UAE in the folder of the executable or one of its parents makes Data beside it the root"
   macos:
     path: "~/Library/Application Support/FS-UAE/Data"
-    source_ref: "od-fs/fsuae/fsuae-init.c:75-82, 84-117"
+    source_ref: "od-fs/fsuae/fsuae-init.c:81-88, od-fs/fsuae/fsuae-init.c:90-123"
     note: "A Portable.ini starting with # FS-UAE in the folder of the executable or one of its parents makes Data beside it the root"
   linux:
     path: "$XDG_DATA_HOME/FS-UAE/Data, else ~/.local/share/FS-UAE/Data"
-    source_ref: "od-fs/fsuae/fsuae-init.c:75-82, 84-117"
+    source_ref: "od-fs/fsuae/fsuae-init.c:81-88, od-fs/fsuae/fsuae-init.c:90-123"
     note: "A Portable.ini starting with # FS-UAE in the folder of the executable or one of its parents makes Data beside it the root"
 
 notes: |
@@ -42,8 +42,8 @@ notes: |
   and the Amiga Forever shared ROM folder. Every .rom, .bin or model-suffixed
   file up to 8 MB is handed to the emulator with its CRC32 and SHA-1. rom.key
   is read from the folder of the encrypted ROM being loaded.
-  ref: od-fs/python/fsuae/services/pathservice.py:47-57, od-fs/python/fsuae/roms/romservice.py:25-75,
-  od-fs/python/app/app_init.py:83-86, od-fs/fsuae/fsuae-messages.cpp:83-104, rommgr.cpp:2001-2012
+  ref: od-fs/Python/fsuae/services/pathservice.py:47-57, od-fs/Python/fsuae/roms/romservice.py:25-75,
+  od-fs/Python/app/app_init.py:83-86, od-fs/fsuae/fsuae-messages.cpp:83-104, rommgr.cpp:2067-2078
   Batocera overrides to bios/amiga/ via --kickstarts_dir (batocera fsuaePaths.py:8, batocera fsuaeGenerator.py:68).
   Libretro port: scans save_dir/fsuae/Kickstarts/ (frozen at v2.7.15), and
   reads rom.key there. The base directory is <save_dir>/fsuae, the build
@@ -54,16 +54,16 @@ notes: |
   source sources/src/fs-uae/config.c:128, source libretro/libretro.c:194-206,
   source libretro/libretro.c:575
 
-  Identification by SHA-1 checksum, not filename (rommgr.cpp:92-151, od-fs/python/fsuae/roms/romservice.py:78-91).
-  AROS kickstart (1 MB) compiled into binary as fallback for all models (rommgr.cpp:112).
-  rom.key searched in kickstart dir and multiple fallback paths (rommgr.cpp:1397-1498).
+  Identification by SHA-1 checksum, not filename (rommgr.cpp:93-152, od-fs/Python/fsuae/roms/romservice.py:78-91).
+  AROS kickstart (1 MB) compiled into binary as fallback for all models (rommgr.cpp:113).
+  rom.key searched in kickstart dir and multiple fallback paths (rommgr.cpp:1433-1534).
 
   Supported models: A1000, A500, A500+, A600, A1200, A3000, A4000, A4000T, CD32, CDTV.
   Default model is A500. Each model auto-selects its kickstart via quickstart
-  mechanism (cfgfile.cpp:9468-9517 for A500, cfgfile.cpp:9732-9791 for dispatch).
+  mechanism (cfgfile.cpp:9592-9641 for A500, cfgfile.cpp:9856-9915 for dispatch).
 
   ROM database shared between standalone and libretro (same WinUAE-derived rommgr.cpp).
-  Upstream v5.0.7 has a larger database (332 vs ~200 ROM IDs in libretro port).
+  Upstream v5.0.7 has a larger database (344 vs ~200 ROM IDs in libretro port, rommgr.cpp:101).
   Also supports Arcadia, ALG, freezer cartridges, SCSI/CPU board ROMs when configured.
 
 files:
@@ -79,7 +79,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 500 Kickstart 1.3 r34.5. Default model ROM."
-    source_ref: "upstream rommgr.cpp:150-151 (id=6, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:151-152 (id=6, ROMTYPE_KICK)"
 
   - name: "amiga-os-204.rom"
     path: "fsuae/Kickstarts/amiga-os-204.rom"
@@ -93,7 +93,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 500+ Kickstart 2.04 r37.175."
-    source_ref: "upstream rommgr.cpp:158-159 (id=7, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:159-160 (id=7, ROMTYPE_KICK)"
 
   - name: "amiga-os-205.rom"
     path: "fsuae/Kickstarts/amiga-os-205.rom"
@@ -107,7 +107,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 600 Kickstart 2.05 r37.350."
-    source_ref: "upstream rommgr.cpp:164-165 (id=10, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:165-166 (id=10, ROMTYPE_KICK)"
 
   - name: "amiga-os-120.rom"
     path: "fsuae/Kickstarts/amiga-os-120.rom"
@@ -121,7 +121,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 1000 Kickstart 1.2 r33.180."
-    source_ref: "upstream rommgr.cpp:148-149 (id=5, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:149-150 (id=5, ROMTYPE_KICK)"
 
   - name: "amiga-os-310-a1200.rom"
     path: "fsuae/Kickstarts/amiga-os-310-a1200.rom"
@@ -135,7 +135,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 1200 Kickstart 3.1 r40.68."
-    source_ref: "upstream rommgr.cpp:185-186 (id=15, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:186-187 (id=15, ROMTYPE_KICK)"
 
   - name: "amiga-os-310-a3000.rom"
     path: "fsuae/Kickstarts/amiga-os-310-a3000.rom"
@@ -149,7 +149,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 3000 Kickstart 3.1 r40.68."
-    source_ref: "upstream rommgr.cpp:189-190 (id=61, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:190-191 (id=61, ROMTYPE_KICK)"
 
   - name: "amiga-os-310-a4000.rom"
     path: "fsuae/Kickstarts/amiga-os-310-a4000.rom"
@@ -163,7 +163,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga 4000 Kickstart 3.1 r40.68."
-    source_ref: "upstream rommgr.cpp:195-196 (id=16, ROMTYPE_KICK)"
+    source_ref: "upstream rommgr.cpp:196-197 (id=16, ROMTYPE_KICK)"
 
   - name: "amiga-os-310-cd32.rom"
     path: "fsuae/Kickstarts/amiga-os-310-cd32.rom"
@@ -177,7 +177,7 @@ files:
     validation: [sha1]
     mode: both
     note: "Amiga CD32 Kickstart 3.1 r40.60."
-    source_ref: "upstream rommgr.cpp:312-313 (id=18, ROMTYPE_KICKCD32)"
+    source_ref: "upstream rommgr.cpp:324-325 (id=18, ROMTYPE_KICKCD32)"
 
   - name: "amiga-ext-310-cd32.rom"
     path: "fsuae/Kickstarts/amiga-ext-310-cd32.rom"
@@ -190,7 +190,7 @@ files:
     validation: [sha1]
     mode: both
     note: "CD32 extended ROM r40.60. Required for CD32 mode."
-    source_ref: "upstream rommgr.cpp:314-315 (id=19, ROMTYPE_EXTCD32)"
+    source_ref: "upstream rommgr.cpp:326-327 (id=19, ROMTYPE_EXTCD32)"
 
   - name: "cd32fmv.rom"
     path: "fsuae/Kickstarts/cd32fmv.rom"
@@ -203,7 +203,7 @@ files:
     validation: [sha1]
     mode: both
     note: "CD32 Full Motion Video cartridge ROM v40.30. Also accepts v40.22 (391777-01)."
-    source_ref: "upstream rommgr.cpp:323-326 (id=23/74, ROMTYPE_CD32CART)"
+    source_ref: "upstream rommgr.cpp:335-338 (id=23/74, ROMTYPE_CD32CART)"
 
   - name: "amiga-ext-130-cdtv.rom"
     path: "fsuae/Kickstarts/amiga-ext-130-cdtv.rom"
@@ -216,7 +216,7 @@ files:
     validation: [sha1]
     mode: both
     note: "CDTV extended ROM v1.0. Required for CDTV mode. Also accepts v2.30 and v2.7."
-    source_ref: "upstream rommgr.cpp:328-329 (id=20, ROMTYPE_EXTCDTV)"
+    source_ref: "upstream rommgr.cpp:340-341 (id=20, ROMTYPE_EXTCDTV)"
 
   - name: "rom.key"
     path: "fsuae/Kickstarts/rom.key"
@@ -227,4 +227,4 @@ files:
     required: false
     mode: both
     note: "Cloanto Amiga Forever decryption key. Enables encrypted ROM loading."
-    source_ref: "upstream rommgr.cpp:119-124 (ROMTYPE_KEY), upstream rommgr.cpp:1397-1412 (addkeydir)"
+    source_ref: "upstream rommgr.cpp:120-125 (ROMTYPE_KEY), upstream rommgr.cpp:1433-1448 (addkeydir)"
diff --git a/website/src/data/source-paths.json b/website/src/data/source-paths.json
index b5e05212f..9c691f2d9 100644
--- a/website/src/data/source-paths.json
+++ b/website/src/data/source-paths.json
@@ -864,14 +864,14 @@
   "src/memory.cpp",
   "src/rommgr.cpp"
  ],
- "github.com/FrodeSolheim/fs-uae@f362278ccd4c60991caac3b4d240d4a3f751bea2": [
+ "github.com/FrodeSolheim/fs-uae@79ac88e3727ee4d35d964aa07ad78894b844da27": [
   "cfgfile.cpp",
   "configure.ac",
+  "od-fs/Python/app/app_init.py",
+  "od-fs/Python/fsuae/roms/romservice.py",
+  "od-fs/Python/fsuae/services/pathservice.py",
   "od-fs/fsuae/fsuae-init.c",
   "od-fs/fsuae/fsuae-messages.cpp",
-  "od-fs/python/app/app_init.py",
-  "od-fs/python/fsuae/roms/romservice.py",
-  "od-fs/python/fsuae/services/pathservice.py",
   "rommgr.cpp"
  ],
  "github.com/HarbourMasters/Ghostship@deb091c29caff57dd986398087b058f16b11911e": [
@@ -6683,7 +6683,8 @@
   "src/launcher.cpp",
   "src/main.cpp",
   "src/parsing/textfile.cpp",
-  "src/platforms/engineutils.cpp"
+  "src/platforms/engineutils.cpp",
+  "tools/errorgen"
  ],
  "github.com/linappleii/linapple@7f4b60898d91bfecd6f4d8683a374f38b0564962": [
   "CMakeLists.txt",