diff --git a/.gitignore b/.gitignore
index d17ca589b9..4026fb2246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,6 @@ composer.lock
 .env
 bundle-stats.html
 .claude/settings.local.json
+.claude/worktrees
 polyscope.json
 storybook-static
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bafba499c9..24f4014d0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Release Notes
 
+## 6.21.0 (2026-06-10)
+
+### What's new
+- Add default sorting support for taxonomies [#14772](https://github.com/statamic/cms/issues/14772) by @finnjsmith
+- Add default initial option configuration option for Link fieldtype [#14698](https://github.com/statamic/cms/issues/14698) by @martyf
+- Add `exclude` param to stache commands [#14788](https://github.com/statamic/cms/issues/14788) by @edalzell
+
+### What's fixed
+- Fix Modify::__toString() throwing TypeError for non-string scalar values [#14674](https://github.com/statamic/cms/issues/14674) by @VerburgtJimmy
+- Speed up Stache warming for large structured collections [#14781](https://github.com/statamic/cms/issues/14781) by @o1y
+- Implement permissions cache on eloquent users [#14661](https://github.com/statamic/cms/issues/14661) by @ryanmitchell
+- Adjust listing skeleton to match configured features [#14796](https://github.com/statamic/cms/issues/14796) by @daun
+- Fix docs for `Listing` component [#14798](https://github.com/statamic/cms/issues/14798) by @duncanmcclean
+- Don't reserve space when a field's display label is hidden [#14803](https://github.com/statamic/cms/issues/14803) by @jasonvarga
+- Bump web-auth/webauthn-lib to ^5.3.0 [#14727](https://github.com/statamic/cms/issues/14727) by @sstraakenbroek
+- Prevent overlapping git commit jobs [#14672](https://github.com/statamic/cms/issues/14672) by @aerni
+- French translations [#14789](https://github.com/statamic/cms/issues/14789) by @ebeauchamps
+
+
+
 ## 6.20.3 (2026-06-08)
 
 ### What's fixed
diff --git a/CLAUDE.md b/CLAUDE.md
index d1ceab745a..160b42f47f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -95,6 +95,11 @@ The project uses Vite for asset compilation with separate configs:
   - Short strings (like "Submit" or "Click here") can use the translation strings as keys. 
   - Longer phrases or sentences should use keys and have their translations stored in an appropriate translation file.
   - When adding to a translation file, only English strings need to be added. Other languages will be provided by contributors.
+  - Exception messages can stay untranslated in English
+
+## Misc
+
+- Commit messages within a PR do *not* need the PR number prefix. Those are just for the PR merge commit itself.
 
 
 ## Links