diff --git a/emulators/00_example.yml b/emulators/00_example.yml
index b7e3a7100..6f43c3a15 100644
--- a/emulators/00_example.yml
+++ b/emulators/00_example.yml
@@ -4,7 +4,11 @@ core_classification: pure_libretro
 source: "https://github.com/libretro/libretro-core-info"
 profiled_date: "2026-03-22"
 source_commit: "bd81a0b73b50449c0862b65bd755d87860925f65"
-core_version: ~
+core_version: "v1.22.2-3-gbd81a0b"
+version_basis:
+  kind: tag
+  tag: "v1.22.2"
+  distance: 3
 display_name: "Example Core (.info template)"
 cores:
   - 00_example
diff --git a/emulators/2048.yml b/emulators/2048.yml
index 149ba2d96..b979db5af 100644
--- a/emulators/2048.yml
+++ b/emulators/2048.yml
@@ -5,7 +5,11 @@ source: "https://github.com/libretro/libretro-2048"
 upstream: "https://github.com/gabrielecirulli/2048"
 profiled_date: "2026-03-22"
 source_commit: "39333f7b13dc4daea7c151d9c38d22b961246343"
-core_version: "1.0"
+core_version: "v1.0"
+version_basis:
+  kind: file
+  path: "libretro.c"
+  pattern: 'info->library_version\s+=\s+"([^"]+)'
 display_name: "2048"
 cores: ["2048"]
 systems: []
diff --git a/emulators/dolphin_launcher.yml b/emulators/dolphin_launcher.yml
index b94a9981b..17fade041 100644
--- a/emulators/dolphin_launcher.yml
+++ b/emulators/dolphin_launcher.yml
@@ -7,6 +7,10 @@ upstream: "https://github.com/dolphin-emu/dolphin"
 profiled_date: "2026-03-23"
 source_commit: "6d72f3093d33461821e4f7fde6d3308187e644b9"
 core_version: "1.2.0"
+version_basis:
+  kind: tag
+  tag: "1.2.0"
+  distance: 0
 display_name: "Nintendo - GameCube / Wii (Dolphin Launcher)"
 cores:
   - dolphin_launcher
diff --git a/emulators/eden-nightly.yml b/emulators/eden-nightly.yml
index 4b77c6a7c..c3efcea5f 100644
--- a/emulators/eden-nightly.yml
+++ b/emulators/eden-nightly.yml
@@ -9,7 +9,11 @@ upstream: "https://git.eden-emu.dev/eden-emu/eden"
 source_mirror: "https://codeberg.org/eden-emu/eden"
 source_commit: "8648c27cbb4c17b176076b09ac245271829cbd9f"
 profiled_date: "2026-08-11"
-core_version: "Git"
+core_version: "v0.2.0-220-g8648c27"
+version_basis:
+  kind: tag
+  tag: "v0.2.0"
+  distance: 220
 display_name: "Eden Nightly (Nintendo Switch)"
 cores: ["eden-nightly"]
 systems: [nintendo-switch]
diff --git a/emulators/ep128emu.yml b/emulators/ep128emu.yml
index 6007549e3..0f43da1c4 100644
--- a/emulators/ep128emu.yml
+++ b/emulators/ep128emu.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "ep128emu_core"
 profiled_date: "2026-03-30"
 core_version: "v1.2.13"
+version_basis:
+  kind: alias
+  of: "ep128emu_core"
 display_name: "Enterprise - 64/128 (ep128emu)"
 cores:
   - ep128emu
diff --git a/emulators/flycast_gles2.yml b/emulators/flycast_gles2.yml
index c704b227a..e21f1eca9 100644
--- a/emulators/flycast_gles2.yml
+++ b/emulators/flycast_gles2.yml
@@ -2,7 +2,10 @@ emulator: "Flycast GLES2"
 type: alias
 alias_of: "flycast"
 profiled_date: "2026-03-23"
-core_version: "0.1"
+core_version: "v2.7-90-ge88b0ce"
+version_basis:
+  kind: alias
+  of: "flycast"
 display_name: "Sega - Dreamcast/Naomi (Flycast GLES2)"
 cores:
   - flycast_gles2
diff --git a/emulators/freeintv_ts_overlay.yml b/emulators/freeintv_ts_overlay.yml
index a84b982bc..8d35f02b6 100644
--- a/emulators/freeintv_ts_overlay.yml
+++ b/emulators/freeintv_ts_overlay.yml
@@ -6,6 +6,9 @@ source: "https://github.com/jcarr71/FreeIntvTSOverlay"
 upstream: "https://github.com/libretro/FreeIntv"
 profiled_date: "2026-03-22"
 core_version: "1.2"
+version_basis:
+  kind: alias
+  of: "freeintv"
 display_name: "Mattel - Intellivision (FreeIntvTSOverlay)"
 cores:
   - freeintv
diff --git a/emulators/gong.yml b/emulators/gong.yml
index 8ff212780..066fe86e7 100644
--- a/emulators/gong.yml
+++ b/emulators/gong.yml
@@ -5,7 +5,11 @@ source: "https://github.com/libretro/gong"
 upstream: "https://danzaidan.itch.io/"
 profiled_date: "2026-03-23"
 source_commit: "69ef0b69dc542af4c1cf2efcc451dd6c378281b6"
-core_version: "1.0"
+core_version: "v1.0"
+version_basis:
+  kind: file
+  path: "gong.c"
+  pattern: 'library_version\s*=\s*"([^"]+)"'
 display_name: "Gong"
 cores: [gong]
 systems: []
diff --git a/emulators/mednafen_gba.yml b/emulators/mednafen_gba.yml
index 619352ea3..d8d3deaee 100644
--- a/emulators/mednafen_gba.yml
+++ b/emulators/mednafen_gba.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "beetle_gba"
 profiled_date: "2026-03-24"
 core_version: "v0.9.36"
+version_basis:
+  kind: alias
+  of: "beetle_gba"
 display_name: "Nintendo - Game Boy Advance (Beetle GBA)"
 cores:
   - mednafen_gba
diff --git a/emulators/mednafen_lynx.yml b/emulators/mednafen_lynx.yml
index 8cbe2ac90..b40c5620d 100644
--- a/emulators/mednafen_lynx.yml
+++ b/emulators/mednafen_lynx.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "beetle_lynx"
 profiled_date: "2026-03-24"
 core_version: "v1.24.0"
+version_basis:
+  kind: alias
+  of: "beetle_lynx"
 display_name: "Atari - Lynx (Beetle Lynx)"
 cores:
   - mednafen_lynx
diff --git a/emulators/mednafen_ngp.yml b/emulators/mednafen_ngp.yml
index 408ef2e03..0afaf8e37 100644
--- a/emulators/mednafen_ngp.yml
+++ b/emulators/mednafen_ngp.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "beetle_ngp"
 profiled_date: "2026-03-24"
 core_version: "v1.29.0.0"
+version_basis:
+  kind: alias
+  of: "beetle_ngp"
 display_name: "SNK - Neo Geo Pocket / Color (Beetle NeoPop)"
 cores:
   - mednafen_ngp
diff --git a/emulators/mednafen_pce.yml b/emulators/mednafen_pce.yml
index 257a68920..d83519043 100644
--- a/emulators/mednafen_pce.yml
+++ b/emulators/mednafen_pce.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "beetle_pce"
 profiled_date: "2026-03-24"
 core_version: "v1.29.0"
+version_basis:
+  kind: alias
+  of: "beetle_pce"
 display_name: "NEC - PC Engine / SuperGrafx / CD (Beetle PCE)"
 cores:
   - mednafen_pce
diff --git a/emulators/mednafen_pcfx.yml b/emulators/mednafen_pcfx.yml
index 1739c42c3..9db6618cf 100644
--- a/emulators/mednafen_pcfx.yml
+++ b/emulators/mednafen_pcfx.yml
@@ -3,6 +3,9 @@ type: alias
 alias_of: "beetle_pcfx"
 profiled_date: "2026-03-24"
 core_version: "v0.9.36.5"
+version_basis:
+  kind: alias
+  of: "beetle_pcfx"
 display_name: "NEC - PC-FX (Beetle PC-FX)"
 cores:
   - mednafen_pcfx
diff --git a/emulators/mednafen_psx.yml b/emulators/mednafen_psx.yml
index 72928feef..1b5bd75f0 100644
--- a/emulators/mednafen_psx.yml
+++ b/emulators/mednafen_psx.yml
@@ -2,7 +2,10 @@ emulator: "mednafen_psx"
 type: alias
 alias_of: "beetle_psx"
 profiled_date: "2026-03-24"
-core_version: "v0.9.44.1"
+core_version: "0.9.44.1"
+version_basis:
+  kind: alias
+  of: "beetle_psx"
 display_name: "Sony - PlayStation (Beetle PSX)"
 cores:
   - mednafen_psx
diff --git a/emulators/mednafen_psx_hw.yml b/emulators/mednafen_psx_hw.yml
index f0ce68dfc..7b712fa27 100644
--- a/emulators/mednafen_psx_hw.yml
+++ b/emulators/mednafen_psx_hw.yml
@@ -2,7 +2,10 @@ emulator: "mednafen_psx_hw"
 type: alias
 alias_of: "beetle_psx"
 profiled_date: "2026-03-24"
-core_version: "v0.9.44.1"
+core_version: "0.9.44.1"
+version_basis:
+  kind: alias
+  of: "beetle_psx"
 display_name: "Sony - PlayStation (Beetle PSX HW)"
 cores:
   - mednafen_psx_hw
diff --git a/emulators/mednafen_saturn.yml b/emulators/mednafen_saturn.yml
index eef662942..3d13c15f5 100644
--- a/emulators/mednafen_saturn.yml
+++ b/emulators/mednafen_saturn.yml
@@ -2,7 +2,10 @@ emulator: "mednafen_saturn"
 type: alias
 alias_of: "beetle_saturn"
 profiled_date: "2026-03-24"
-core_version: "v0.9.45.1"
+core_version: "v1.32.1"
+version_basis:
+  kind: alias
+  of: "beetle_saturn"
 display_name: "Sega - Saturn (Beetle Saturn)"
 cores:
   - mednafen_saturn
diff --git a/emulators/mednafen_vb.yml b/emulators/mednafen_vb.yml
index b432c290a..34ba982ab 100644
--- a/emulators/mednafen_vb.yml
+++ b/emulators/mednafen_vb.yml
@@ -2,7 +2,10 @@ emulator: "mednafen_vb"
 type: alias
 alias_of: "beetle_vb"
 profiled_date: "2026-03-24"
-core_version: "v0.9.36.1"
+core_version: "v1.31.0"
+version_basis:
+  kind: alias
+  of: "beetle_vb"
 display_name: "Nintendo - Virtual Boy (Beetle VB)"
 cores:
   - mednafen_vb
diff --git a/emulators/mednafen_wswan.yml b/emulators/mednafen_wswan.yml
index d82bcc4d8..c51252939 100644
--- a/emulators/mednafen_wswan.yml
+++ b/emulators/mednafen_wswan.yml
@@ -4,6 +4,9 @@ alias_of: "beetle_wswan"
 source: "https://github.com/libretro/beetle-wswan-libretro"
 profiled_date: "2026-03-24"
 core_version: "v0.9.35.1"
+version_basis:
+  kind: alias
+  of: "beetle_wswan"
 display_name: "Bandai - WonderSwan/Color (Beetle Wonderswan)"
 cores:
   - mednafen_wswan
diff --git a/emulators/mkxp-z.yml b/emulators/mkxp-z.yml
index fa70b77db..6c2ae571e 100644
--- a/emulators/mkxp-z.yml
+++ b/emulators/mkxp-z.yml
@@ -5,4 +5,8 @@ display_name: "RPG Maker XP/VX/VX Ace (mkxp-z)"
 cores:
   - mkxp-z
 profiled_date: "2026-03-24"
+core_version: "2.4.2"
+version_basis:
+  kind: alias
+  of: "mkxp_z"
 files: []
diff --git a/emulators/mupen64plus_next_develop.yml b/emulators/mupen64plus_next_develop.yml
index a4f9476c9..f59ca7cac 100644
--- a/emulators/mupen64plus_next_develop.yml
+++ b/emulators/mupen64plus_next_develop.yml
@@ -2,7 +2,10 @@ emulator: "Mupen64Plus-Next Develop"
 type: alias
 alias_of: "mupen64plus_next"
 profiled_date: "2026-03-24"
-core_version: "2.8"
+core_version: "2.6.0"
+version_basis:
+  kind: alias
+  of: "mupen64plus_next"
 display_name: "Nintendo - Nintendo 64 (Mupen64Plus-Next Develop)"
 cores:
   - mupen64plus_next_develop
diff --git a/emulators/mupen64plus_next_gles2.yml b/emulators/mupen64plus_next_gles2.yml
index 29d872373..01165cb68 100644
--- a/emulators/mupen64plus_next_gles2.yml
+++ b/emulators/mupen64plus_next_gles2.yml
@@ -2,7 +2,10 @@ emulator: "Mupen64Plus-Next GLES2"
 type: alias
 alias_of: "mupen64plus_next"
 profiled_date: "2026-03-24"
-core_version: "2.8"
+core_version: "2.6.0"
+version_basis:
+  kind: alias
+  of: "mupen64plus_next"
 display_name: "Nintendo - Nintendo 64 (Mupen64Plus-Next GLES2)"
 cores:
   - mupen64plus_next_gles2
diff --git a/emulators/mupen64plus_next_gles3.yml b/emulators/mupen64plus_next_gles3.yml
index 661f1ddf7..e80f488e2 100644
--- a/emulators/mupen64plus_next_gles3.yml
+++ b/emulators/mupen64plus_next_gles3.yml
@@ -2,7 +2,10 @@ emulator: "Mupen64Plus-Next GLES3"
 type: alias
 alias_of: "mupen64plus_next"
 profiled_date: "2026-03-24"
-core_version: "2.8"
+core_version: "2.6.0"
+version_basis:
+  kind: alias
+  of: "mupen64plus_next"
 display_name: "Nintendo - Nintendo 64 (Mupen64Plus-Next GLES3)"
 cores:
   - mupen64plus_next_gles3
diff --git a/emulators/parallel_n64_debug.yml b/emulators/parallel_n64_debug.yml
index d66ab6b2a..29fc75b63 100644
--- a/emulators/parallel_n64_debug.yml
+++ b/emulators/parallel_n64_debug.yml
@@ -2,7 +2,10 @@ emulator: "parallel_n64_debug"
 type: alias
 alias_of: "parallel_n64"
 profiled_date: "2026-03-24"
-core_version: "2.0-rc2"
+core_version: "1.0"
+version_basis:
+  kind: alias
+  of: "parallel_n64"
 display_name: "Nintendo - Nintendo 64 (ParaLLEl) (Debug)"
 cores:
   - parallel_n64_debug
diff --git a/emulators/pygame.yml b/emulators/pygame.yml
index 37bf7d8ef..bde9bb6ec 100644
--- a/emulators/pygame.yml
+++ b/emulators/pygame.yml
@@ -6,6 +6,10 @@ upstream: "https://github.com/pygame/pygame"
 profiled_date: "2026-10-04"
 source_commit: "b92c0da9d1b5eba6c813138790fc1ab6cea0252c"
 core_version: "2.6.1"
+version_basis:
+  kind: tag
+  tag: "2.6.1"
+  distance: 0
 display_name: "Pygame"
 cores: [pygame, python-pygame2]
 systems: []
diff --git a/emulators/radio.yml b/emulators/radio.yml
index 71fd56f7b..f677ed092 100644
--- a/emulators/radio.yml
+++ b/emulators/radio.yml
@@ -8,6 +8,10 @@ profiled_date: "2026-09-17"
 source_commit: "5d7d786ad1d8703a52184ff2ee39712c46ed67c9"
 upstream_commit: "5d7d786ad1d8703a52184ff2ee39712c46ed67c9"
 core_version: "1.1"
+version_basis:
+  kind: file
+  path: "libretro-radio.c"
+  pattern: 'info->library_version\s+=\s+"([^"]+)'
 display_name: "Internet Radio (Radio)"
 cores:
   - radio
diff --git a/emulators/test.yml b/emulators/test.yml
index 29b8b9fff..7aa106683 100644
--- a/emulators/test.yml
+++ b/emulators/test.yml
@@ -4,7 +4,12 @@ core_classification: pure_libretro
 source: "https://github.com/libretro/libretro-samples"
 upstream: "https://github.com/libretro/libretro-samples"
 profiled_date: "2026-03-25"
+source_commit: "bce193bc1b8c9a3da43b2ead0158a69e28b37ed8"
 core_version: "v1"
+version_basis:
+  kind: file
+  path: "tests/test/libretro-test.c"
+  pattern: 'info->library_version\s*=\s*"([^"]+)"'
 display_name: "Test"
 cores:
   - test
diff --git a/emulators/testgl.yml b/emulators/testgl.yml
index ec10faf45..2c0d9a58c 100644
--- a/emulators/testgl.yml
+++ b/emulators/testgl.yml
@@ -4,7 +4,12 @@ core_classification: pure_libretro
 source: "https://github.com/libretro/libretro-samples"
 upstream: "https://github.com/libretro/libretro-samples"
 profiled_date: "2026-03-25"
+source_commit: "bce193bc1b8c9a3da43b2ead0158a69e28b37ed8"
 core_version: "v1"
+version_basis:
+  kind: file
+  path: "video/opengl/libretro_test_gl_shaders/libretro_gl_test.c"
+  pattern: 'info->library_version\s*=\s*"([^"]+)"'
 display_name: "TestGL"
 cores:
   - testgl
diff --git a/emulators/testvulkan.yml b/emulators/testvulkan.yml
index 66fbcf55e..bdfa9d66c 100644
--- a/emulators/testvulkan.yml
+++ b/emulators/testvulkan.yml
@@ -4,7 +4,12 @@ core_classification: pure_libretro
 source: "https://github.com/libretro/libretro-samples"
 upstream: "https://github.com/libretro/libretro-samples"
 profiled_date: "2026-03-25"
+source_commit: "bce193bc1b8c9a3da43b2ead0158a69e28b37ed8"
 core_version: "v1"
+version_basis:
+  kind: file
+  path: "video/vulkan/vk_rendering/libretro-test.c"
+  pattern: 'info->library_version\s*=\s*"([^"]+)"'
 display_name: "TestVulkan"
 cores:
   - testvulkan
diff --git a/emulators/vba_m.yml b/emulators/vba_m.yml
index 921b7ebd3..61ee98ff9 100644
--- a/emulators/vba_m.yml
+++ b/emulators/vba_m.yml
@@ -1,5 +1,9 @@
 emulator: VBA-M
 type: alias
 alias_of: vbam
+core_version: "2.1.3"
+version_basis:
+  kind: alias
+  of: "vbam"
 note: Legacy profile key retained for platform and buildbot compatibility.
 files: []
diff --git a/emulators/video_processor.yml b/emulators/video_processor.yml
index dd246ddcf..9a3e1f187 100644
--- a/emulators/video_processor.yml
+++ b/emulators/video_processor.yml
@@ -9,6 +9,10 @@ profiled_date: "2026-09-17"
 source_commit: "8fe4751f0039a1b645bf750531fcfc234958a7ac"
 upstream_commit: "c608ced893583e0a8a8153890f99453fd1647d53"
 core_version: "0.0.2"
+version_basis:
+  kind: file
+  path: "video_processor_v4l2.c"
+  pattern: '#define LIBRARY_VERSION\s+"([^"]+)"'
 display_name: "Video Processor (V4L2)"
 cores:
   - video_processor
diff --git a/emulators/vidtest.yml b/emulators/vidtest.yml
index 81193887e..d690e1e5d 100644
--- a/emulators/vidtest.yml
+++ b/emulators/vidtest.yml
@@ -3,7 +3,12 @@ type: test
 core_classification: pure_libretro
 source: "https://github.com/schellingb/vidtest_libretro"
 profiled_date: "2026-03-25"
+source_commit: "edfd32747e5eeb5ce82a5cee686ee1b32f1cc52e"
 core_version: "0.1"
+version_basis:
+  kind: file
+  path: "vidtest.c"
+  pattern: 'info->library_version\s*=\s*"([^"]+)"'
 display_name: "VidTest"
 cores:
   - vidtest