diff --git a/CHANGELOG b/CHANGELOG
index e888365..cc53d14 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -197,3 +197,12 @@
 * Add warning for limited accounts in web UI (Gargron)
 * Add limited attribute to accounts in REST API (Gargron)
 
+[1.8.4]
+* Update Mastodon to 3.5.4
+* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v3.5.4)
+* Install ruby 3.0.4
+* Fix emoFix emoji substitution not applying only to text nodes in backend code (ClearlyClaire)
+* Fix emoji substitution not applying only to text nodes in Web UI (ClearlyClaire)
+* Fix rate limiting for paths with formats (Gargron)
+* Fix out-of-bound reads in blurhash transcoder (delroth)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 57294fb..810accc 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.8.3",
-  "upstreamVersion": "3.5.3",
+  "version": "1.8.4",
+  "upstreamVersion": "3.5.4",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,