diff --git a/CHANGELOG.md b/CHANGELOG.md
index 481c985786..a8f6e89135 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 Note that PRs for the latest version are sometimes missing here, check [github](https://github.com/locustio/locust/releases) for the latest info.
 
+## [2.8.4](https://github.com/locustio/locust/tree/2.8.4) (2022-03-15)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.8.3...2.8.4)
+
+**Fixed bugs:**
+
+- Locust while running as library with grpc client not outputting stats [\#1969](https://github.com/locustio/locust/issues/1969)
+- Locust does not stop all users [\#1947](https://github.com/locustio/locust/issues/1947)
+
+**Closed issues:**
+
+- Introduce test\_stopping event [\#2031](https://github.com/locustio/locust/issues/2031)
+
 ## [2.8.3](https://github.com/locustio/locust/tree/2.8.3) (2022-02-25)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.8.2...2.8.3)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4322698ef8..0ee055a7d5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,12 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.8.4
+=====
+
+* Add `quit` event to enable getting the locust process exit code https://github.com/locustio/locust/pull/2049
+* Fix users sometimes not being stopped correctly https://github.com/locustio/locust/pull/2041
+
 2.8.3
 =====