diff --git a/CHANGELOG.md b/CHANGELOG.md
index 180e079a..5790566d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ It also requires NodeJS 16 or superior (same as Peertube 5.2.0.)
 
 ### Minor changes and fixes
 
+* Updating ConverseJS (v11 WIP) with latest fixes.
 * Various translation updates.
 * Using Typescript 5.5.4, and Eslint 8.57.0 (with new ruleset).
 * Fix race condition in bot/ctl.
diff --git a/conversejs/build-conversejs.sh b/conversejs/build-conversejs.sh
index a1f105f6..c0720784 100644
--- a/conversejs/build-conversejs.sh
+++ b/conversejs/build-conversejs.sh
@@ -29,8 +29,8 @@ CONVERSE_COMMIT="9952046d580bc2930e29833f4c9987a3d4c95bc2"
 
 # 2024-09-03: include badges short label and quick fix for sendMessage button
 CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
-CONVERSE_VERSION="livechat-11.0.1"
-CONVERSE_COMMIT=""
+CONVERSE_VERSION="livechat-12.0.0"
+CONVERSE_COMMIT="a910586fa83bd64db7182add6fc4bbf71cef0ae8"
 
 rootdir="$(pwd)"
 src_dir="$rootdir/conversejs"