diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f911bd39..5ac0050a4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ file is the human-readable summary of what changed and why.
 
 ## Unreleased
 
+## 1.18.4-8
+
 ### Agent
 
 - **MiniMax models get a prompt written for their class** — prompt selection
@@ -15,9 +17,10 @@ file is the human-readable summary of what changed and why.
   the prompt used for Kimi, which contains nothing Kimi-specific: it is the one
   for open-weight agentic models, spelling out that tools must be used rather
   than described, encouraging parallel tool calls, giving `<system-reminder>`
-  authority, and matching the user's language.
-
-## 1.18.4-7
+  authority, and matching the user's language. Submitted upstream as
+  [anomalyco/opencode#41032](https://github.com/anomalyco/opencode/pull/41032),
+  and if it lands there, this entry retires.
+  ([#166](https://github.com/quickbeard/codev-code/pull/166))
 
 ### TUI