diff --git a/CHANGELOG b/CHANGELOG
index 2ec33db..0207fe4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -334,3 +334,10 @@
 * Fix trending publishers table not rendering correctly on narrow screens (vmstan)
 * Fix CSP headers being unintentionally wide (ClearlyClaire)
 
+[1.11.8]
+* Update Mastodon to 4.1.6
+* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v4.1.6)
+* Fix memory leak in streaming server (ThisIsMissEm)
+* Fix wrong filters sometimes applying in streaming (ClearlyClaire, ThisIsMissEm, renchap)
+* Fix incorrect connect timeout in outgoing requests (ClearlyClaire)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index ea2df49..b0c1557 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.11.7",
-  "upstreamVersion": "4.1.5",
+  "version": "1.11.8",
+  "upstreamVersion": "4.1.6",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,
diff --git a/Dockerfile b/Dockerfile
index b3e296a..09e2813 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ RUN gem install --no-document bundler
 ENV RAILS_ENV production
 ENV NODE_ENV production
 
-ARG VERSION=4.1.5
+ARG VERSION=4.1.6
 
 RUN curl -L https://github.com/tootsuite/mastodon/archive/v${VERSION}.tar.gz | tar -xz --strip-components 1 -f - && \
     bundle config --local set deployment 'true' && \