diff --git a/CHANGELOG b/CHANGELOG
index b65e476..c925eff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -423,3 +423,13 @@
 * [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v4.2.3)
 * Fix dependency on json-canonicalization version that has been made unavailable since last release
 
+[1.12.4]
+* Update Mastodon to 4.2.4
+* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v4.2.4)
+* Add rate-limit of TOTP authentication attempts at controller level (ClearlyClaire)
+* Fix error when processing remote files with unusually long names (ClearlyClaire)
+* Fix processing of compacted single-item JSON-LD collections (ClearlyClaire)
+* Retry 401 errors on replies fetching (ShadowJonathan)
+* Fix RecordNotUnique errors in LinkCrawlWorker (tribela)
+* Fix Mastodon not correctly processing HTTP Signatures with query strings (ClearlyClaire, ClearlyClaire)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index cc24fc1..018efe5 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.12.3",
-  "upstreamVersion": "4.2.3",
+  "version": "1.12.4",
+  "upstreamVersion": "4.2.4",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,