diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ceb26be4ec..12fbdf8650 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,8 @@ Changelog
  * Remove the legacy Hallo rich text editor as it has moved to an external package (LB (Ben Johnston))
  * Increase the size of checkboxes throughout the UI, and simplify their alignment (Steven Steinwand)
  * Adopt [MyST](https://myst-parser.readthedocs.io/en/latest/) for parsing documentation written in Markdown, replaces recommonmark (LB (Ben Johnston), Thibaud Colas)
+ * Installing docs extras requirements in CircleCI so issues with the docs requirements are picked up earlier (Thibaud Colas)
+ * Remove core usage of jinjalint and migrate to curlylint to resolve dependency incompatibility issues (Thibaud Colas)
  * Fix: When using `simple_translations` ensure that the user is redirected to the page edit view when submitting for a single locale (Mitchel Cabuloy)
  * Fix: When previewing unsaved changes to `Form` pages, ensure that all added fields are correctly shown in the preview (Joshua Munn)
  * Fix: When Documents (e.g. PDFs) have been configured to be served inline via `WAGTAILDOCS_CONTENT_TYPES` & `WAGTAILDOCS_INLINE_CONTENT_TYPES` ensure that the filename is correctly set in the `Content-Disposition` header so that saving the files will use the correct filename (John-Scott Atlakson)
diff --git a/docs/releases/2.17.md b/docs/releases/2.17.md
index a0b8786e61..8cafc31fd9 100644
--- a/docs/releases/2.17.md
+++ b/docs/releases/2.17.md
@@ -37,6 +37,8 @@ The panel types `StreamFieldPanel`, `RichTextFieldPanel`, `ImageChooserPanel`, `
  * Remove the legacy Hallo rich text editor as it has moved to an external package (LB (Ben Johnston))
  * Increase the size of checkboxes throughout the UI, and simplify their alignment (Steven Steinwand)
  * Adopt [MyST](https://myst-parser.readthedocs.io/en/latest/) for parsing documentation written in Markdown, replaces recommonmark (LB (Ben Johnston), Thibaud Colas)
+ * Installing docs extras requirements in CircleCI so issues with the docs requirements are picked up earlier (Thibaud Colas)
+ * Remove core usage of jinjalint and migrate to curlylint to resolve dependency incompatibility issues (Thibaud Colas)
 
 
 ### Bug fixes
@@ -87,3 +89,8 @@ As of this release, the use of special-purpose field panel types such as `Stream
  * If the panel provides a `get_comparison_class` method, your code should instead call `wagtail.admin.compare.register_comparison_class` to register the comparison class against the relevant model field type.
 
 If you do continue to use a custom panel class, note that the template context for panels derived from `BaseChooserPanel` has changed - the context variable `is_chosen`, and the variable name given by the panel's `object_type_name` property, are no longer available on the template. The only available variables are now `field` and `show_add_comment_button`. If your template depends on these additional variables, you will need to pass them explicitly by overriding the `render_as_field` method.
+
+### jinjalint replaced with curlylint
+
+* Jinjalint is no longer actively maintained so the core Wagtail code has moved to a fork of this project [`curlylint`](https://github.com/thibaudcolas/curlylint).
+* If your usage of Wagtail relies on the inclusion of [`jinjalint`](https://github.com/motet-a/jinjalint), you will now need to explicitly include this as a separate dependency.