diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83a86db5be..895881ec80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 18.0.1 – 2023-12-15
+### Changed
+- Update translations
+
+### Fixed
+- fix(shares): Fix notifications for captions with mentions or as a reply
+  [#11242](https://github.com/nextcloud/spreed/issues/11242)
+- fix(shares): Fix replying to message with attachments
+  [#11242](https://github.com/nextcloud/spreed/issues/11242)
+- fix(shares): Reserve space for file previews while loading
+  [#11196](https://github.com/nextcloud/spreed/issues/11196)
+- fix(chat): Don't trim the quote when it is not an image share with caption
+  [#11237](https://github.com/nextcloud/spreed/issues/11237)
+- fix(call): Reset "Start recording" checkbox on "Media settings" close
+  [#11227](https://github.com/nextcloud/spreed/issues/11227)
+- fix(call): Fix uploading files as image for the call background
+  [#11214](https://github.com/nextcloud/spreed/issues/11214)
+- fix(notifications): Fix the order of event listeners to improve responsiveness when starting calls
+  [#11238](https://github.com/nextcloud/spreed/issues/11238)
+
 ## 18.0.0 – 2023-12-12
 ### Added
 - 🗒️ Note to self
diff --git a/appinfo/info.xml b/appinfo/info.xml
index bc9f23fa59..e1a55ce95e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
 
 	]]></description>
 
-	<version>18.0.0</version>
+	<version>18.0.1</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>
diff --git a/package-lock.json b/package-lock.json
index 1b0ca1bb6e..ad40d3faa5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "18.0.0",
+  "version": "18.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "18.0.0",
+      "version": "18.0.1",
       "license": "agpl",
       "dependencies": {
         "@linusborg/vue-simple-portal": "^0.1.5",
diff --git a/package.json b/package.json
index 402d22df61..ea00df01db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "18.0.0",
+  "version": "18.0.1",
   "private": true,
   "description": "",
   "author": "Joas Schilling <coding@schilljs.com>",