diff --git a/.changeset/wait-what-context-map.md b/.changeset/wait-what-context-map.md
new file mode 100644
index 0000000..edaa4d6
--- /dev/null
+++ b/.changeset/wait-what-context-map.md
@@ -0,0 +1,5 @@
+---
+"mattpocock-skills": patch
+---
+
+wait-what: follow `CONTEXT-MAP.md` to the right `CONTEXT.md` when a repo indexes multiple contexts that way instead of keeping a single root `CONTEXT.md`.
diff --git a/docs/productivity/wait-what.md b/docs/productivity/wait-what.md
index 3895580..bd86a16 100644
--- a/docs/productivity/wait-what.md
+++ b/docs/productivity/wait-what.md
@@ -22,7 +22,7 @@ The skill says re-pitch **that**, not "that last message". What lost you is usua
 
 The body reuses the leading words already in your global `CLAUDE.md` and your project's `CONTEXT.md`. ASD-STE100 Simplified Technical English sets the register. The ubiquitous language supplies the nouns. The skill, `CLAUDE.md` and `CONTEXT.md` reach for the same [tokens](https://www.aihero.dev/ai-coding-dictionary/token), so invoking it is not a new instruction. It is a reminder of one the agent already agreed to.
 
-If you have no `CONTEXT.md`, the skill still works. You lose only the domain-vocabulary half.
+If you have no `CONTEXT.md` — and no `CONTEXT-MAP.md` pointing to one for the context at hand — the skill still works. You lose only the domain-vocabulary half.
 
 ## It's working if
 
diff --git a/skills/productivity/wait-what/SKILL.md b/skills/productivity/wait-what/SKILL.md
index d493cfa..9f07f01 100644
--- a/skills/productivity/wait-what/SKILL.md
+++ b/skills/productivity/wait-what/SKILL.md
@@ -4,4 +4,4 @@ description: Stop. That last message did not land — re-pitch it.
 disable-model-invocation: true
 ---
 
-Wait — I don't understand where you've got to here. Re-pitch that: give me a little bit of context, talk in ASD-STE100 Simplified Technical English, and use the ubiquitous language from `CONTEXT.md`.
+Wait — I don't understand where you've got to here. Re-pitch that: give me a little bit of context, talk in ASD-STE100 Simplified Technical English, and use the ubiquitous language from `CONTEXT.md` (follow `CONTEXT-MAP.md` to the right one if the repo has more than one).