diff --git a/CHANGELOG-release.md b/CHANGELOG-release.md
index ff7729b1d9..e5a02a67af 100644
--- a/CHANGELOG-release.md
+++ b/CHANGELOG-release.md
@@ -1,3 +1,18 @@
+## 2024.4
+This release introduces support for iOS 18, including a new sidebar/tab bar on iPad, as well as bugfixes and improvements.
+
+Features/Improvements:
+- Import image description when adding attachments from Photos if possible
+- iPadOS 18: New floating sidebar/tab bar
+
+Bugfixes:
+- Fix crash when viewing profiles in certain circumstances
+- Fix video controls in attachment gallery not auto-hiding
+- Fix crash if hashtag search results includes duplicates
+- Fix "no content" text not being removed from list timeline after refreshing
+- macOS: Fix video controls overlay being positioned incorrectly when Reduce Motion is on
+- macOS: Fix reselecting current item not navigating back
+
 ## 2024.3
 This update includes a number of bugfixes and performance improvements. See below for a list of fixes.
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79a9127480..7e2b99ab02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 2024.4 (136)
+Features/Improvements:
+- Import image description when adding attachments from Photos if possible
+- Reorganize toolbar buttons when adding saved hashtag
+- Show errors when loading video in attachment gallery fails
+
+Bugfixes:
+- Fix crash when viewing profiles in certain circumstances
+- Fix profile tab switching animation getting stuck
+- Fix video controls in attachment gallery not auto-hiding
+- Pleroma: Fix error when loading polls in some circumstances
+- iPadOS 18: Fix incorrect two-column layout when closing sidebar
+- macOS: Fix video controls overlay being positioned incorrectly when Reduce Motion is on
+- macOS: Fix reselecting current item not navigating back
+
 ## 2024.4 (135)
 Features/Improvements:
 - iOS 18: New floating sidebar/tab bar
diff --git a/NotificationExtension/NotificationService.swift b/NotificationExtension/NotificationService.swift
index 5acec490e1..6270a33583 100644
--- a/NotificationExtension/NotificationService.swift
+++ b/NotificationExtension/NotificationService.swift
@@ -231,7 +231,7 @@ class NotificationService: UNNotificationServiceExtension {
         let updatedContent: UNMutableNotificationContent
        
         let contentProviding: any UNNotificationContentProviding
-        if #available(iOS 18.0, *),
+        if #available(iOS 18.0, visionOS 2.0, *),
            await Preferences.shared.hasFeatureFlag(.pushNotifCustomEmoji) {
             let attributedString = NSMutableAttributedString(string: content.body)
             
diff --git a/Version.xcconfig b/Version.xcconfig
index 05fd304759..abcfb85d3f 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -10,7 +10,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2024.4
-CURRENT_PROJECT_VERSION = 135
+CURRENT_PROJECT_VERSION = 136
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev