diff --git a/doc/de/weechat_faq.de.adoc b/doc/de/weechat_faq.de.adoc
index 696b71d36..4fae57831 100644
--- a/doc/de/weechat_faq.de.adoc
+++ b/doc/de/weechat_faq.de.adoc
@@ -727,6 +727,38 @@ werden um sich, vor dem Betreten von Channels, bei "nickserv" zu identifizieren:
 /set irc.server.freenode.command_delay 5
 ----
 
+// TRANSLATION MISSING
+[[edit_autojoin]]
+=== How can I add/remove channels from autojoin option?
+
+// TRANSLATION MISSING
+You can use the `/set` command to edit the list of autojoin channels,
+for example for the "freenode" server:
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+// TRANSLATION MISSING
+[NOTE]
+You can complete the name and value of option with the kbd:[Tab] key
+(or kbd:[Shift+Tab] for partial completion, useful for the name). +
+This way you don't have to type the whole list of channels.
+
+// TRANSLATION MISSING
+You can also use the `/fset` command to edit the list of channels:
+
+----
+/fset autojoin
+----
+
+// TRANSLATION MISSING
+Another solution is to use a script:
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === Was ist der Unterschied zwischen dem Befehl /ignore und /filter?
 
diff --git a/doc/en/weechat_faq.en.adoc b/doc/en/weechat_faq.en.adoc
index 46eeb0b09..fc52a5693 100644
--- a/doc/en/weechat_faq.en.adoc
+++ b/doc/en/weechat_faq.en.adoc
@@ -699,6 +699,33 @@ join of channels):
 /set irc.server.freenode.command_delay 5
 ----
 
+[[edit_autojoin]]
+=== How can I add/remove channels from autojoin option?
+
+You can use the `/set` command to edit the list of autojoin channels,
+for example for the "freenode" server:
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+[NOTE]
+You can complete the name and value of option with the kbd:[Tab] key
+(or kbd:[Shift+Tab] for partial completion, useful for the name). +
+This way you don't have to type the whole list of channels.
+
+You can also use the `/fset` command to edit the list of channels:
+
+----
+/fset autojoin
+----
+
+Another solution is to use a script:
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === What is the difference between the /ignore and /filter commands?
 
diff --git a/doc/fr/weechat_faq.fr.adoc b/doc/fr/weechat_faq.fr.adoc
index b3e5d9faa..687dd2d7d 100644
--- a/doc/fr/weechat_faq.fr.adoc
+++ b/doc/fr/weechat_faq.fr.adoc
@@ -725,6 +725,34 @@ commande et le join des canaux) :
 /set irc.server.freenode.command_delay 5
 ----
 
+[[edit_autojoin]]
+=== Comment puis-je ajouter/supprimer des canaux de l'option autojoin ?
+
+Vous pouvez utiliser la commande `/set` pour éditer la liste des canaux de
+l'autojoin, par exemple pour le serveur freenode :
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+[NOTE]
+Vous pouvez compléter le nom et les valeurs de l'option avec la touche kbd:[Tab]
+(ou kbd:[Shift+Tab] pour une complétion partielle, pratique pour le nom). +
+De cette façon, vous n'avez pas à taper la liste complète des canaux.
+
+Vous pouvez également utiliser la commande `/fset` pour éditer la liste
+des canaux :
+
+----
+/fset autojoin
+----
+
+Une autre solution est d'utiliser un script :
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === Quelle est la différence entre les commandes /ignore et /filter ?
 
diff --git a/doc/it/weechat_faq.it.adoc b/doc/it/weechat_faq.it.adoc
index d91eaa3a9..e837d27e2 100644
--- a/doc/it/weechat_faq.it.adoc
+++ b/doc/it/weechat_faq.it.adoc
@@ -757,6 +757,38 @@ comando e l'ingresso nei canali):
 /set irc.server.freenode.command_delay 5
 ----
 
+// TRANSLATION MISSING
+[[edit_autojoin]]
+=== How can I add/remove channels from autojoin option?
+
+// TRANSLATION MISSING
+You can use the `/set` command to edit the list of autojoin channels,
+for example for the "freenode" server:
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+// TRANSLATION MISSING
+[NOTE]
+You can complete the name and value of option with the kbd:[Tab] key
+(or kbd:[Shift+Tab] for partial completion, useful for the name). +
+This way you don't have to type the whole list of channels.
+
+// TRANSLATION MISSING
+You can also use the `/fset` command to edit the list of channels:
+
+----
+/fset autojoin
+----
+
+// TRANSLATION MISSING
+Another solution is to use a script:
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === Qual è la differenza tra i comandi /ignore e /filter?
 
diff --git a/doc/ja/weechat_faq.ja.adoc b/doc/ja/weechat_faq.ja.adoc
index 7694d1be5..4f81c6e8c 100644
--- a/doc/ja/weechat_faq.ja.adoc
+++ b/doc/ja/weechat_faq.ja.adoc
@@ -692,6 +692,38 @@ of channels):
 /set irc.server.freenode.command_delay 5
 ----
 
+// TRANSLATION MISSING
+[[edit_autojoin]]
+=== How can I add/remove channels from autojoin option?
+
+// TRANSLATION MISSING
+You can use the `/set` command to edit the list of autojoin channels,
+for example for the "freenode" server:
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+// TRANSLATION MISSING
+[NOTE]
+You can complete the name and value of option with the kbd:[Tab] key
+(or kbd:[Shift+Tab] for partial completion, useful for the name). +
+This way you don't have to type the whole list of channels.
+
+// TRANSLATION MISSING
+You can also use the `/fset` command to edit the list of channels:
+
+----
+/fset autojoin
+----
+
+// TRANSLATION MISSING
+Another solution is to use a script:
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === /ignore と /filter コマンドの違いは何ですか。
 
diff --git a/doc/pl/weechat_faq.pl.adoc b/doc/pl/weechat_faq.pl.adoc
index 402bf24ae..058538b86 100644
--- a/doc/pl/weechat_faq.pl.adoc
+++ b/doc/pl/weechat_faq.pl.adoc
@@ -709,6 +709,38 @@ na kanały):
 /set irc.server.freenode.command_delay 5
 ----
 
+// TRANSLATION MISSING
+[[edit_autojoin]]
+=== How can I add/remove channels from autojoin option?
+
+// TRANSLATION MISSING
+You can use the `/set` command to edit the list of autojoin channels,
+for example for the "freenode" server:
+
+----
+/set irc.server.freenode.autojoin [TAB]
+----
+
+// TRANSLATION MISSING
+[NOTE]
+You can complete the name and value of option with the kbd:[Tab] key
+(or kbd:[Shift+Tab] for partial completion, useful for the name). +
+This way you don't have to type the whole list of channels.
+
+// TRANSLATION MISSING
+You can also use the `/fset` command to edit the list of channels:
+
+----
+/fset autojoin
+----
+
+// TRANSLATION MISSING
+Another solution is to use a script:
+
+----
+/script search autojoin
+----
+
 [[ignore_vs_filter]]
 === Jaka jest różnica między komendami/ignore i /filter ?