diff --git a/CHANGELOG b/CHANGELOG
index ae22353..8673864 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -161,3 +161,14 @@
 * Fix stop condition of a Common Table Expression (ClearlyClaire)
 * Disable legacy XSS filtering (Wonderfall)
 
+[1.8.0]
+* Update Mastodon to 3.5.0
+* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v3.5.0)
+* Add support for incoming edited posts
+* Add appeals for moderator decisions
+* Add notifications for posts deleted by moderators
+* Add explore page with trending posts and links
+* Add graphs and retention metrics to admin dashboard
+* Add notifications for moderators about new sign-ups
+* Add ability to suspend accounts in batches in admin UI 
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 255279a..bf7f550 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.7.5",
+  "version": "1.8.0",
+  "upstreamVersion": "3.5.0",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1610612736,
@@ -36,6 +37,6 @@
   "documentationUrl": "https://docs.cloudron.io/apps/mastodon/",
   "postInstallMessage": "file://POSTINSTALL.md",
   "optionalSso": true,
-  "minBoxVersion": "5.5.0",
+  "minBoxVersion": "7.1.2",
   "forumUrl": "https://forum.cloudron.io/category/41/mastodon"
 }
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index ee890de..fc6775d 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,5 +1,3 @@
-This app packages Mastodon <upstream>3.4.6</upstream>.
-
 ## About
 
 Mastodon is a free, open-source social network server based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub)!
diff --git a/Dockerfile b/Dockerfile
index 62456d4..b59a8d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN gem install --no-document bundler
 ENV RAILS_ENV production
 ENV NODE_ENV production
 
-ARG VERSION=3.4.6
+ARG VERSION=3.5.0
 
 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' && \