diff --git a/emulators/mame.yml b/emulators/mame.yml
index 27310155..5d65acfc 100644
--- a/emulators/mame.yml
+++ b/emulators/mame.yml
@@ -6,6 +6,7 @@ upstream: "https://github.com/mamedev/mame"
 logo: "https://raw.githubusercontent.com/mamedev/mame/master/docs/source/images/MAMElogo.svg"
 profiled_date: "2026-03-29"
 source_commit: "c4127c164af8fcf0aea781cc039aaf9b8044696d"
+upstream_commit: "e2bff5f80bd92631d2200cf57703ffa890003709"
 core_version: "0.289"
 display_name: "Arcade (MAME)"
 
diff --git a/emulators/mamearcade.yml b/emulators/mamearcade.yml
index e9c3d815..c2da0903 100644
--- a/emulators/mamearcade.yml
+++ b/emulators/mamearcade.yml
@@ -5,6 +5,7 @@ source: "https://github.com/libretro/mame"
 upstream: "https://github.com/mamedev/mame"
 profiled_date: "2026-03-24"
 source_commit: "c1ff660dbddd5b134f549b4881499699cee1ebb6"
+upstream_commit: "e2bff5f80bd92631d2200cf57703ffa890003709"
 core_version: "0.287"
 display_name: "Arcade (MAME/Arcade)"
 
diff --git a/emulators/mamemess.yml b/emulators/mamemess.yml
index 5acacbaf..907c6609 100644
--- a/emulators/mamemess.yml
+++ b/emulators/mamemess.yml
@@ -5,6 +5,7 @@ source: "https://github.com/libretro/mame"
 upstream: "https://github.com/mamedev/mame"
 profiled_date: "2026-03-29"
 source_commit: "c4127c164af8fcf0aea781cc039aaf9b8044696d"
+upstream_commit: "e2bff5f80bd92631d2200cf57703ffa890003709"
 core_version: "0.287"
 display_name: "Multi (MAME/MESS)"
 
diff --git a/scripts/profile_sync.py b/scripts/profile_sync.py
index f269823e..80236c97 100644
--- a/scripts/profile_sync.py
+++ b/scripts/profile_sync.py
@@ -236,12 +236,12 @@ def is_external_citation(path: str) -> bool:
 def _anchor_tokens(entry: dict) -> list[str]:
     """Values worth searching for when a cited line misses its subject.
 
-    Archive entries are named `stvbios.zip` while the driver source writes the
-    set name alone, so the stem is searched as well as the full name.
+    Both the content values and the set name are searched, because profiles
+    cite two different shapes. FBNeo and Hypseus refs point at the ROM table,
+    where the CRC32s are; MAME refs point at the machine declaration, which
+    carries the set name and no hash at all.
     """
     tokens = collect_tokens(entry)
-    if entry_hashes(entry):
-        return tokens
     name = os.path.basename(str(entry.get("name", ""))).lower()
     stem = name.rsplit(".", 1)[0]
     if stem and stem not in tokens and len(stem) > 2:
@@ -782,17 +782,25 @@ def reconcile_self_check(parts: list[PartResult]) -> list[PartResult]:
     ]
 
 
-def version_tag_candidates(core_version: str) -> list[str]:
-    """Tag spellings a declared core_version might use."""
+def version_tag_candidates(core_version: str, repo_name: str = "") -> list[str]:
+    """Tag spellings a declared core_version might use.
+
+    Some projects prefix their own name and drop the separators, the way
+    mamedev/mame publishes 0.289 as `mame0289`, so that spelling is derived
+    from the repository name rather than listed per project.
+    """
     version = str(core_version or "").strip()
     if not version or " " in version:
         return []
     bare = version.lstrip("vV")
-    return list(dict.fromkeys([version, f"v{bare}", bare]))
+    spellings = [version, f"v{bare}", bare]
+    if repo_name:
+        spellings.append(f"{repo_name}{bare.replace('.', '')}")
+    return list(dict.fromkeys(spellings))
 
 
 def detect_pinned_tag(
-    profile: dict, repo, pin: str, head: str, cache_dir: str, offline: bool
+    profile: dict, views, cache_dir: str, offline: bool
 ) -> str | None:
     """Tag the profile is pinned to, when the repository has moved past it.
 
@@ -806,11 +814,14 @@ def detect_pinned_tag(
     that a repository publishing nightly tags cannot hide an old release behind
     pagination.
     """
-    if pin == head:
-        return None
-    for tag in version_tag_candidates(profile.get("core_version")):
-        if upstream.tag_commit(repo, tag, cache_dir, offline) == pin:
-            return tag
+    for view in views:
+        if view.pin == view.head:
+            continue
+        for tag in version_tag_candidates(
+            profile.get("core_version"), view.repo.name
+        ):
+            if upstream.tag_commit(view.repo, tag, cache_dir, offline) == view.pin:
+                return tag
     return None
 
 
@@ -848,9 +859,7 @@ def build_report(
     report.repos = [v.repo.slug for v in views]
     report.pin, report.pin_origin = primary.pin, primary.origin
     report.head = primary.head
-    report.pinned_tag = detect_pinned_tag(
-        profile, primary.repo, primary.pin, primary.head, cache_dir, offline
-    )
+    report.pinned_tag = detect_pinned_tag(profile, views, cache_dir, offline)
 
     # A profile carrying no source_ref still has a pin worth writing and a
     # version worth checking, so the revisions above are resolved first.
diff --git a/tests/test_profile_sync.py b/tests/test_profile_sync.py
index f7ee8ea9..d9e867e1 100644
--- a/tests/test_profile_sync.py
+++ b/tests/test_profile_sync.py
@@ -449,7 +449,9 @@ class TestAnchorTokens(unittest.TestCase):
         tokens = profile_sync._anchor_tokens(
             {"name": "esh.zip", "contents": [{"crc32": "c14f36b3"}]}
         )
-        self.assertEqual(tokens, ["c14f36b3"])
+        # The set name stays: a MAME ref cites the machine declaration, which
+        # carries the name and no hash.
+        self.assertEqual(tokens, ["c14f36b3", "esh"])
 
     def test_a_hashless_archive_still_falls_back_to_its_stem(self):
         tokens = profile_sync._anchor_tokens(