diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74f4e77db4c..2a85334d4ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+<!-- 8.4.2 START -->
+
+# 8.4.2 (2022-02-23)
+
+### Features and enhancements
+
+- **OAuth:** Add setting to skip org assignment for external users. [#34834](https://github.com/grafana/grafana/pull/34834), [@baez90](https://github.com/baez90)
+- **Tracing:** Add option to map tag names to log label names in trace to logs settings. [#45178](https://github.com/grafana/grafana/pull/45178), [@connorlindsey](https://github.com/connorlindsey)
+
+### Bug fixes
+
+- **Explore:** Fix closing split pane when logs panel is used. [#45602](https://github.com/grafana/grafana/pull/45602), [@ifrost](https://github.com/ifrost)
+
+<!-- 8.4.2 END -->
 <!-- 8.4.1 START -->
 
 # 8.4.1 (2022-02-18)
diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md
index 0cbb62a40e0..8cb3c83df60 100644
--- a/docs/sources/release-notes/_index.md
+++ b/docs/sources/release-notes/_index.md
@@ -8,6 +8,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.4.2]({{< relref "release-notes-8-4-2" >}})
 - [Release notes for 8.4.1]({{< relref "release-notes-8-4-1" >}})
 - [Release notes for 8.4.0-beta1]({{< relref "release-notes-8-4-0-beta1" >}})
 - [Release notes for 8.3.5]({{< relref "release-notes-8-3-5" >}})
diff --git a/docs/sources/release-notes/release-notes-8-4-2.md b/docs/sources/release-notes/release-notes-8-4-2.md
new file mode 100644
index 00000000000..760462b592f
--- /dev/null
+++ b/docs/sources/release-notes/release-notes-8-4-2.md
@@ -0,0 +1,17 @@
++++
+title = "Release notes for Grafana 8.4.2"
+hide_menu = true
++++
+
+<!-- Auto generated by update changelog github action -->
+
+# Release notes for Grafana 8.4.2
+
+### Features and enhancements
+
+- **OAuth:** Add setting to skip org assignment for external users. [#34834](https://github.com/grafana/grafana/pull/34834), [@baez90](https://github.com/baez90)
+- **Tracing:** Add option to map tag names to log label names in trace to logs settings. [#45178](https://github.com/grafana/grafana/pull/45178), [@connorlindsey](https://github.com/connorlindsey)
+
+### Bug fixes
+
+- **Explore:** Fix closing split pane when logs panel is used. [#45602](https://github.com/grafana/grafana/pull/45602), [@ifrost](https://github.com/ifrost)