diff --git a/CHANGELOG.md b/CHANGELOG.md
index 978cdd1c0cc..82039a8363c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<!-- 8.5.9 START -->
+
+# 8.5.9 (2022-07-14)
+
+### 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 ef4b86ed012..e7e5ad68af3 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -10,6 +10,7 @@ weight: 10000
 Here you can find detailed release notes that list everything that is included in every release as well as notices
 about deprecations, breaking changes as well as changes that relate to plugin development.
 
+- [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" >}})
@@ -18,6 +19,7 @@ about deprecations, breaking changes as well as changes that relate to plugin de
 - [Release notes for 8.5.1]({{< relref "release-notes-8-5-1" >}})
 - [Release notes for 8.5.0]({{< relref "release-notes-8-5-0" >}})
 - [Release notes for 8.5.0-beta1]({{< relref "release-notes-8-5-0-beta1" >}})
+- [Release notes for 8.4.10]({{< relref "release-notes-8-4-10" >}})
 - [Release notes for 8.4.7]({{< relref "release-notes-8-4-7" >}})
 - [Release notes for 8.4.6]({{< relref "release-notes-8-4-6" >}})
 - [Release notes for 8.4.5]({{< relref "release-notes-8-4-5" >}})
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)