diff --git a/app/build.gradle b/app/build.gradle
index caff3fad..b2da1ba2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 420
-        versionName "3.5.3"
+        versionCode 421
+        versionName "3.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 1aa696d4..e889965a 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.6.0",
+    "code": "421",
+    "note": "Added:\n- Edit messages (if your instance supports that feature)\n- Pin/Unpin messages\n- Set the default language for translations\n- Change app icon (Settings > Interface)\n- Allow to disable \"remember position\" in timelines\n- Allow to disable notification aggregation in settings\n- Icon on media previews if a description is available\n\nChanged:\n- Allow to disable/enable media for notifications\n\nFixed:\n- Post loses \"spoiler message\" when adding a media\n- Camera not working on Android 11\n- Notification aggregation\n- Vibrations when fetching new notifications\n- Fix an issue with media timelines\n- Fix some theme issues\n- Some crashes"
+  },
   {
     "version": "3.5.3",
     "code": "420",
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/421.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/421.txt
new file mode 100644
index 00000000..633b7ef1
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/421.txt
@@ -0,0 +1,20 @@
+Added:
+- Edit messages (if your instance supports that feature)
+- Pin/Unpin messages
+- Set the default language for translations
+- Change app icon (Settings > Interface)
+- Allow to disable "remember position" in timelines
+- Allow to disable notification aggregation in settings
+- Icon on media previews if a description is available
+
+Changed:
+- Allow to disable/enable media for notifications
+
+Fixed:
+- Post loses "spoiler message" when adding a media
+- Camera not working on Android 11
+- Notification aggregation
+- Vibrations when fetching new notifications
+- Fix an issue with media timelines
+- Fix some theme issues
+- Some crashes
\ No newline at end of file