diff --git a/conversejs/build-conversejs.sh b/conversejs/build-conversejs.sh
index 4d3e8e76..3f384cc5 100644
--- a/conversejs/build-conversejs.sh
+++ b/conversejs/build-conversejs.sh
@@ -18,29 +18,17 @@ set -x
 CONVERSE_VERSION="v11.0.0"
 CONVERSE_REPO="https://github.com/conversejs/converse.js.git"
 # You can eventually set CONVERSE_COMMIT to a specific commit ID, if you want to apply some patches.
+# 2024-07-15: using Converse upstream (v11 WIP).
 CONVERSE_COMMIT="46313ad92c1a861bcb50b9653859cfa9a960ae4a"
+# 2024-07-15, FIXME: the following commit includes a quick fix for Converse/#3443, waiting for upstream to be fixed.
+CONVERSE_COMMIT="7d65ef8d30a1f3949dbc590b6d27a9d786bf819f"
 
-# 2014-01-16: we are using a custom version, to wait for some PR to be apply upstream.
-# This version includes following changes:
-# - #converse.js/3300: Adding the maxWait option for `debouncedPruneHistory`
-# - #converse.js/3302: debounce MUC sidebar rendering
-# - Fix: refresh the MUC sidebar when participants collection is sorted
-# - Fix: MUC occupant list does not sort itself on nicknames or roles changes
-# - Fix inconsistency between browsers on textarea outlines
-# - Fix: room information not correctly refreshed when modifications are made by other users
-# This version already includes following changes that will not be merged in ConverseJS upstream:
-# - Don't load vCards for all room occupants when the right menu is closed
-# - Changing the default avatar, for something very light (to mitigate blinking effect when vCards are loaded)
-# - Custom settings livechat_load_all_vcards for the readonly mode
-# - Adding "users" icon in the menu toggle button
-# - Removing unecessary plugins: headless/pubsub, minimize, notifications, profile, omemo, push, roomlist, dragresize.
-# - Destroy room: remove the challenge, and the new JID
-# - New config option [colorize_username](https://conversejs.org/docs/html/configuration.html#colorize_username)
-# - New loadEmojis hook, to customize emojis at runtime.
-# - Fix custom emojis path when assets_path is not the default path.
-# CONVERSE_VERSION="livechat-10.1.0"
+# It is possible to use another repository, if we want some customization that are not upstream (yet):
+# CONVERSE_VERSION="livechat"
 # # CONVERSE_COMMIT="4402fcc3fc60f6c9334f86528c33a0b463371d12"
-# CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
+CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
+# 2024-07-15, fix MUC save.
+CONVERSE_COMMIT="58c682b9ba09038beb961e9d8f804c270408ea69"
 
 rootdir="$(pwd)"
 src_dir="$rootdir/conversejs"
diff --git a/conversejs/custom/livechat-patch-vcard.js b/conversejs/custom/livechat-patch-vcard.js
index 57ee61ef..e108f71d 100644
--- a/conversejs/custom/livechat-patch-vcard.js
+++ b/conversejs/custom/livechat-patch-vcard.js
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2024 John Livingston <https://www.john-livingston.fr/>
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+
 // Here we are patching the vCard plugin, to add some specific optimizations.
 
 import { _converse, api } from '@converse/headless/index.js'