diff --git a/emulators/scummvm-standalone.yml b/emulators/scummvm-standalone.yml
index 5c18f10c9..e7bc5aef6 100644
--- a/emulators/scummvm-standalone.yml
+++ b/emulators/scummvm-standalone.yml
@@ -4,7 +4,7 @@ core_classification: game_engine
 source: "https://github.com/scummvm/scummvm"
 logo: "https://raw.githubusercontent.com/scummvm/scummvm/master/icons/scummvm.svg"
 profiled_date: "2026-10-24"
-source_commit: "6f7b060d3f940c9dec1a33172a2c4273f86cce69"
+source_commit: "21955df19b580dad2807ec55f573b5f348690a81"
 core_version: "2026.4.1git"
 display_name: "ScummVM (SDL2)"
 mode: standalone
@@ -96,6 +96,15 @@ files:
     note: "Roland MT-32 PCM sample ROM."
 
 
+  # Japanese Macintosh fonts, not shipped with ScummVM.
+
+  - name: "japanesemacfonts.dat"
+    path: "japanesemacfonts.dat"
+    required: false
+    source_ref: "graphics/macgui/macfontmanager.cpp:199-204, graphics/macgui/macfontmanager.cpp:303-344, graphics/macgui/macfontmanager.cpp:503-507"
+    note: "Zip of TrueType fonts, each registered under its name without the .ttf extension, read when the Mac GUI runs in Japanese or a Japanese font is requested, in builds with FreeType. devtools/create_japanesemacfonts.sh builds it from Osaka.ttf and OsakaMono.ttf of the Mac OS X Lion installer. Without it the Japanese fonts are not loaded and a warning is printed."
+
+
   # GUI themes and launcher data.
 
   - name: "scummremastered.zip"
@@ -527,7 +536,7 @@ files:
     size: 15981464
     sha1: "e049932518390257f4d49b1691cad229e6060079"
     md5: "e359fb7f14c4cb072b6e9300a23a6d62"
-    source_ref: "engines/ultima/shared/engine/data_archive.cpp:84-90, engines/ultima/ultima4/ultima4.cpp:128, engines/ultima/nuvie/nuvie.cpp:99"
+    source_ref: "common/engine_data.cpp:273-279, engines/ultima/ultima4/ultima4.cpp:128, engines/ultima/nuvie/nuvie.cpp:99"
     note: "Ultima engines (Ultima I, IV, VI and the Nuvie games)."
 
 
diff --git a/website/src/data/source-paths.json b/website/src/data/source-paths.json
index 749c4a249..96e0b1d3a 100644
--- a/website/src/data/source-paths.json
+++ b/website/src/data/source-paths.json
@@ -8522,7 +8522,7 @@
   "app/src/main/java/com/sbro/emucorex/ui/cheats/CheatManagerScreen.kt",
   "app/src/main/java/com/sbro/emucorex/ui/gamedb/GameDbCatalogRepository.kt"
  ],
- "github.com/scummvm/scummvm@6f7b060d3f940c9dec1a33172a2c4273f86cce69": [
+ "github.com/scummvm/scummvm@21955df19b580dad2807ec55f573b5f348690a81": [
   "Makefile.common",
   "audio/softsynth/fluidsynth.cpp",
   "audio/softsynth/mt32.cpp",
@@ -8537,6 +8537,7 @@
   "backends/vkeybd/virtual-keyboard.cpp",
   "base/commandLine.cpp",
   "base/main.cpp",
+  "common/engine_data.cpp",
   "common/str-enc.cpp",
   "common/translation.cpp",
   "configure",
@@ -8576,7 +8577,6 @@
   "engines/tony/tony.cpp",
   "engines/toon/toon.cpp",
   "engines/ultima/nuvie/nuvie.cpp",
-  "engines/ultima/shared/engine/data_archive.cpp",
   "engines/ultima/ultima4/ultima4.cpp",
   "engines/ultima/ultima8/ultima8.cpp",
   "engines/wintermute/base/base_file_manager.cpp",