diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 760e44ca85..553a932b64 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 2.17 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~~
 
+ * Phase out special-purpose panel types (`StreamFieldPanel`, `RichTextFieldPanel`, `ImageChooserPanel`, `DocumentChooserPanel`, `PageChooserPanel`, `SnippetChooserPanel`) in favour of `FieldPanel` (Matt Westcott)
  * Upgrade ESLint and Stylelint configurations to latest shared Wagtail configs (Thibaud Colas)
  * Major updates to frontend tooling; move Node tooling from Gulp to Webpack, upgrade to Node v16 and npm v8, eslint v8, stylelint v14 and others (Thibaud Colas)
  * Change comment headers’ date formatting to use browser APIs instead of requiring a library (LB (Ben Johnston))
diff --git a/docs/releases/2.17.md b/docs/releases/2.17.md
index cfc67a0d30..62730d6406 100644
--- a/docs/releases/2.17.md
+++ b/docs/releases/2.17.md
@@ -14,6 +14,12 @@ Here are other changes related to the redesign:
 
  * Switch the Wagtail branding font to a system font stack (Steven Steinwand)
 
+
+### Removal of special-purpose field panel types
+
+The panel types `StreamFieldPanel`, `RichTextFieldPanel`, `ImageChooserPanel`, `DocumentChooserPanel` and `SnippetChooserPanel` have been phased out, and can now be replaced with `FieldPanel`. Additionally, `PageChooserPanel` is only required when passing a `page_type` or `can_choose_root`, and can otherwise be replaced with `FieldPanel`. In all cases, `FieldPanel` will now automatically select the most appropriate form element. This feature was developed by Matt Westcott.
+
+
 ### Other features
 
  * Upgrade ESLint and Stylelint configurations to latest shared Wagtail configs (Thibaud Colas)