diff --git a/CHANGELOG b/CHANGELOG
index cc53d14..7396f9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -206,3 +206,8 @@
 * Fix rate limiting for paths with formats (Gargron)
 * Fix out-of-bound reads in blurhash transcoder (delroth)
 
+[1.8.5]
+* Update Mastodon to 3.5.5
+* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v3.5.5)
+* Fix nodes order being sometimes mangled when rewriting emoji (ClearlyClaire)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 810accc..260a22c 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.4",
-  "upstreamVersion": "3.5.4",
+  "version": "1.8.5",
+  "upstreamVersion": "3.5.5",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,