diff --git a/CHANGELOG.md b/CHANGELOG.md
index e47333fce46..9dfded4e08e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -576,6 +576,16 @@ In the Loki data source, for consistency and performance reasons, we changed how
 
 The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559)
 
+<!-- 8.5.9 START -->
+
+# 8.5.9 (unreleased)
+
+### Bug fixes
+
+- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52238](https://github.com/grafana/grafana/pull/52238), [@xlson](https://github.com/xlson)
+
+<!-- 8.5.9 END -->
+
 <!-- 8.5.6 START -->
 
 # 8.5.6 (2022-06-14)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index 5d5a2106fa1..451a74577a8 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -16,6 +16,7 @@ about deprecations, breaking changes as well as changes that relate to plugin de
 - [Release notes for 9.0.0-beta3]({{< relref "release-notes-9-0-0-beta3/" >}})
 - [Release notes for 9.0.0-beta2]({{< relref "release-notes-9-0-0-beta2/" >}})
 - [Release notes for 9.0.0-beta1]({{< relref "release-notes-9-0-0-beta1/" >}})
+- [Release notes for 8.5.9]({{< relref "release-notes-8-5-9" >}})
 - [Release notes for 8.5.6]({{< relref "release-notes-8-5-6/" >}})
 - [Release notes for 8.5.5]({{< relref "release-notes-8-5-5/" >}})
 - [Release notes for 8.5.4]({{< relref "release-notes-8-5-4/" >}})
diff --git a/docs/sources/release-notes/release-notes-8-5-9.md b/docs/sources/release-notes/release-notes-8-5-9.md
new file mode 100644
index 00000000000..e987a00e6de
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-8-5-9.md
@@ -0,0 +1,12 @@
++++
+title = "Release notes for Grafana 8.5.9"
+hide_menu = true
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 8.5.9
+
+### Bug fixes
+
+- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52238](https://github.com/grafana/grafana/pull/52238), [@xlson](https://github.com/xlson)