diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5803b945..a0b372d79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+# [2.3.1] - 2023-06-30
+
+### Added
+
+- Web: Listener to handle composition events
+
+### Changed
+
+- Web: Enable choice of outputting rich text in message or composer format
+- Web: Initialising behaviour to support initialising a composer containing mentions
+- Web: Improved consistency when converting plain text composer output into a Rust model
+
+### Fixed
+
+- Common: Newline handng when parsing block quotes from markdown
+- Common: Issue where links were being split incorrectly inside list items
+- Web: Running tests with coverage no longer hangs in CI
+
 # [2.3.0] - 2023-06-16
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index decb0b776..c19706626 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1368,7 +1368,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi-wysiwyg-composer"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
  "uniffi",
  "uniffi_build",
@@ -1700,7 +1700,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
  "cfg-if",
  "email_address",
@@ -1723,7 +1723,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg-wasm"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
index 3b65fe10a..fd8e365ba 100644
--- a/bindings/wysiwyg-ffi/Cargo.toml
+++ b/bindings/wysiwyg-ffi/Cargo.toml
@@ -7,7 +7,7 @@ description = "Swift and Kotlin bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "uniffi-wysiwyg-composer"
-version = "2.3.0"
+version = "2.3.1"
 rust-version = "1.65"
 
 [lib]
diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
index 122c0af5d..a7182e372 100644
--- a/bindings/wysiwyg-wasm/Cargo.toml
+++ b/bindings/wysiwyg-wasm/Cargo.toml
@@ -7,7 +7,7 @@ description = "WASM bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg-wasm"
-version = "2.3.0"
+version = "2.3.1"
 rust-version = "1.65"
 
 [package.metadata.wasm-pack.profile.profiling]
diff --git a/bindings/wysiwyg-wasm/package-lock.json b/bindings/wysiwyg-wasm/package-lock.json
index 6deeb0a26..448357bd8 100644
--- a/bindings/wysiwyg-wasm/package-lock.json
+++ b/bindings/wysiwyg-wasm/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wysiwyg-wasm",
-      "version": "2.3.0",
+      "version": "2.3.1",
       "license": "Apache-2.0",
       "devDependencies": {
         "jest": "^28.1.0",
diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json
index 22d8a7143..1c8f5b39a 100644
--- a/bindings/wysiwyg-wasm/package.json
+++ b/bindings/wysiwyg-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
   "license": "Apache-2.0",
diff --git a/crates/wysiwyg/Cargo.toml b/crates/wysiwyg/Cargo.toml
index 472981b57..769135e97 100644
--- a/crates/wysiwyg/Cargo.toml
+++ b/crates/wysiwyg/Cargo.toml
@@ -7,7 +7,7 @@ description = "Model code to power a rich text editor for Matrix"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg"
-version = "2.3.0"
+version = "2.3.1"
 rust-version = "1.65"
 
 [features]
diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
index 43a40426b..c154eadef 100644
--- a/platforms/android/gradle.properties
+++ b/platforms/android/gradle.properties
@@ -30,7 +30,7 @@ RELEASE_SIGNING_ENABLED=true
 
 GROUP=io.element.android
 POM_ARTIFACT_ID=wysiwyg
-VERSION_NAME=2.3.0
+VERSION_NAME=2.3.1
 
 POM_NAME=Matrix WYSIWYG
 POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.
diff --git a/platforms/web/package.json b/platforms/web/package.json
index 8ae60e6a2..057408ded 100644
--- a/platforms/web/package.json
+++ b/platforms/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-wysiwyg",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "type": "module",
     "description": "Wysiwyg composer for matrix.org using React",
     "author": "matrix.org",