diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c1fa52d..8450923f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## 6.4.0-alpha.5
 
+### Importante Notes
+
+If you enabled external XMPP connection with plugin v6.3.0,
+and are not using the standard 5269 port, you must add and additional DNS SRV record.
+Check the [documentation](https://johnxlivingston.github.io/peertube-plugin-livechat/documentation/admin/advanced/xmpp_clients/).
+
 ### New Features
 
 * Chat Federation:
@@ -17,7 +23,6 @@ TODO: it seems that in some case A->B can be Websocket, and B->A direct S2S. Che
 TODO?: always generate self-signed certificates. Could be used for outgoing s2s?
 TODO: check in the diagnostic tool that Prosody is >=0.12
 TODO?: allow directs2s on one side and websocket on the other? (currently disallowed by compatibleRemoteAuthenticatedConnectionEnabled)
-TODO: for directS2S, needs a SRV records for the main host if port is not standard.. Must document.
 
 ### Minor changes and fixes
 
diff --git a/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md b/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md
index 0c09a2da..c51d7a51 100644
--- a/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md
+++ b/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md
@@ -89,6 +89,10 @@ $ dig +short _xmpp-server._tcp.room.videos.john-livingston.fr. SRV
 0 5 5269 videos.john-livingston.fr.
 ```
 
+If you are **not using the standard `5269` port**, you must also add a SRV record
+for `_xmpp-server._tcp.your_instance.tld.` (same as above, just without the `room.` prefix).
+Of course, you can also add this record if you use the standard port. It will also work.
+
 ### Using trusted certificates
 
 The self-signed certificates that this plugin uses by default can be rejected by some XMPP servers, for security reasons.
diff --git a/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md b/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md
index f2337c05..8e0517e3 100644
--- a/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md
+++ b/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md
@@ -94,6 +94,10 @@ $ dig +short _xmpp-server._tcp.room.videos.john-livingston.fr. SRV
 0 5 5269 videos.john-livingston.fr.
 ```
 
+Si vous **n'utilisez pas le port standard `5269`**, vous devez ajouter un autre enregistrement SRV pour
+`_xmpp-server._tcp.votre_instance.tld.` (pareil que précédemment, mais en enlevant le préfixe `room.`).
+Bien sûr, vous pouvez l'ajouter même si vous utilisez le port standard. Cela fonctionnera également.
+
 ### Utilisation de certificats de confiance
 
 Les certificats auto-signés que le plugin utilise par défaut peuvent ne pas convenir à tous les serveurs distants.