diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc
index 47b95f667..efcaf3240 100644
--- a/doc/de/weechat_user.de.asciidoc
+++ b/doc/de/weechat_user.de.asciidoc
@@ -90,42 +90,89 @@ Unter OS X kann http://brew.sh/[Homebrew] verwendet werden:
 [[dependencies]]
 ==== Abhängigkeiten
 
-folgende Tabelle beschreibt, welche Pakete zwingend notwendig sind um WeeChat zu kompilieren und
-welche Pakete optional genutzt werden können.
+folgende Tabelle beschreibt, welche Pakete zwingend notwendig sind um WeeChat
+zu kompilieren und welche Pakete optional genutzt werden können.
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Paket ^(1)^                       | Version     | benötigt | Funktion
-| cmake                             |             | *ja*     | Zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
-| pkg-config                        |             | *ja*     | entdeckt installierte Bibliotheken
-| libncursesw5-dev ^(2)^            |             | *ja*     | Ncurses Oberfläche
-| libcurl4-gnutls-dev               |             | *ja*     | URL Transfer
-| zlib1g-dev                        |             | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden
-| libgcrypt20-dev                   |             | *ja*     | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES), Skript-Erweiterung
-| libgnutls28-dev                   | ≥ 2.2.0     |          | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE)
-| gettext                           |             |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch)
-| ca-certificates                   |             |          | Zertifikate für SSL Verbindungen
-| libaspell-dev oder libenchant-dev |             |          | Aspell Erweiterung
-| python-dev                        | ≥ 2.5 ^(3)^ |          | Python Erweiterung
-| libperl-dev                       |             |          | Perl Erweiterung
-| ruby2.1-dev                       | ≥ 1.8       |          | Ruby Erweiterung
-| liblua5.2-dev                     |             |          | Lua Erweiterung
-| tcl-dev                           | ≥ 8.5       |          | Tcl Erweiterung
-| guile-2.0-dev                     | ≥ 2.0       |          | Guile (scheme) Erweiterung
-| asciidoc                          | ≥ 8.5.0     |          | Zum Erstellen der man page und der Dokumentation
-| source-highlight                  |             |          | Syntax Highlight für Quelltext in Dokumentation
-| xsltproc,
-  docbook-xml, docbook-xsl          |             |          | Erstellt man page
-| libcpputest-dev                   | ≥ 3.4       |       .2+| Testlauf
-| C++ compiler                      |             |
+| Paket ^(1)^ | Version | benötigt | Funktion
+| cmake | | *ja* |
+  Zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
+
+| pkg-config | | *ja* |
+  entdeckt installierte Bibliotheken
+
+| libncursesw5-dev ^(2)^ | | *ja* |
+  Ncurses Oberfläche
+
+| libcurl4-gnutls-dev | | *ja* |
+  URL Transfer
+
+| zlib1g-dev | | *ja* |
+  Kompression für Pakete, die mittels Relay- (WeeChat Protokoll),
+  Script-Erweiterung übertragen werden
+
+| libgcrypt20-dev | | *ja* |
+  Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES),
+  Skript-Erweiterung
+
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der
+  Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist
+  englisch)
+
+| ca-certificates | | |
+  Zertifikate für SSL Verbindungen
+
+| libaspell-dev oder libenchant-dev | | |
+  Aspell Erweiterung
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  Python Erweiterung
+
+| libperl-dev | | |
+  Perl Erweiterung
+
+| ruby2.1-dev | ≥ 1.8 | |
+  Ruby Erweiterung
+
+| liblua5.2-dev | | |
+  Lua Erweiterung
+
+| tcl-dev | ≥ 8.5 | |
+  Tcl Erweiterung
+
+| guile-2.0-dev | ≥ 2.0 | |
+  Guile (scheme) Erweiterung
+
+| asciidoc | ≥ 8.5.0 | |
+  Zum Erstellen der man page und der Dokumentation
+
+| source-highlight | | |
+  Syntax Highlight für Quelltext in Dokumentation
+
+| xsltproc, docbook-xml, docbook-xsl | | |
+  Erstellt man page
+
+| libcpputest-dev | ≥ 3.4 | .2+|
+  Testlauf
+
+| C++ compiler | |
 |===
 
+// TRANSLATION MISSING (note 3)
 [NOTE]
-^(1)^ Paketnamen wurden von der Debian GNU/Linux Distribution übernommen. Versionen und Paketnamen
-können für andere Distributionen abweichend sein. +
-^(2)^ WeeChat kann auch mit libncurses5-dev kompiliert werden. Dies wird aber *NICHT* empfohlen (es
-treten dabei Darstellungsfehler mit breiten Zeichen auf). +
-^(3)^ Die empfohlene Version ist 2.7 (alle Skripten laufen mit der Version 2.7,
+^(1)^ Paketnamen wurden von der Debian GNU/Linux Distribution übernommen.
+Versionen und Paketnamen können für andere Distributionen abweichend sein. +
+^(2)^ WeeChat kann auch mit libncurses5-dev kompiliert werden. Dies wird aber
+*NICHT* empfohlen (es treten dabei Darstellungsfehler mit breiten Zeichen
+auf). +
+^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ Die empfohlene Version ist 2.7 (alle Skripten laufen mit der Version 2.7,
 aber nicht mit Version ≤ 2.6 oder ≥ 3.0).
 
 [[compile_with_cmake]]
@@ -2240,6 +2287,49 @@ Optionen für Server sind:
 // TRANSLATION MISSING
 * 'sasl_key': path to private key (for mechanism 'ecdsa-nist256p-challenge')
 
+// TRANSLATION MISSING
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+You must generate a private key in order to authentify with the
+ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+
+You can generate the key with this command:
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Get the public key (encoded as base64) with this command:
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connect to the server, identify (for example with "nickserv identify") and set
+your public key in your account, using nickserv (replace the base64 value with
+your public key):
+
+----
+/connect freenode
+/msg nickserv identify your_password
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configure the SASL options in the server:
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnect to the server:
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== Verbindung zu Freenode mittels TOR/SASL herstellen
 
diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc
index e66a0ae89..e9a461995 100644
--- a/doc/en/weechat_user.en.asciidoc
+++ b/doc/en/weechat_user.en.asciidoc
@@ -88,29 +88,70 @@ compile WeeChat.
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Package ^(1)^                   | Version     | Required | Feature
-| cmake                           |             | *yes*    | Build (autotools still possible, but cmake is recommended)
-| pkg-config                      |             | *yes*    | Detect installed libraries
-| libncursesw5-dev ^(2)^          |             | *yes*    | Ncurses interface
-| libcurl4-gnutls-dev             |             | *yes*    | URL transfer
-| zlib1g-dev                      |             | *yes*    | Compression of packets in relay plugin (weechat protocol), script plugin
-| libgcrypt20-dev                 |             | *yes*    | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
-| libgnutls28-dev                 | ≥ 2.2.0     |          | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
-| gettext                         |             |          | Internationalization (translation of messages; base language is English)
-| ca-certificates                 |             |          | Certificates for SSL connections
-| libaspell-dev or libenchant-dev |             |          | Aspell plugin
-| python-dev                      | ≥ 2.5 ^(3)^ |          | Python plugin
-| libperl-dev                     |             |          | Perl plugin
-| ruby2.1-dev                     | ≥ 1.8       |          | Ruby plugin
-| liblua5.2-dev                   |             |          | Lua plugin
-| tcl-dev                         | ≥ 8.5       |          | Tcl plugin
-| guile-2.0-dev                   | ≥ 2.0       |          | Guile (scheme) plugin
-| asciidoc                        | ≥ 8.5.0     |          | Build man page and documentation
-| source-highlight                |             |          | Syntax highlight for sources in documentation
-| xsltproc,
-  docbook-xml, docbook-xsl        |             |          | Build of man page
-| libcpputest-dev                 | ≥ 3.4       |       .2+| Run tests
-| C++ compiler                    |             |
+| Package ^(1)^ | Version | Required | Feature
+
+| cmake | | *yes* |
+  Build (autotools still possible, but cmake is recommended)
+
+| pkg-config | | *yes* |
+  Detect installed libraries
+
+| libncursesw5-dev ^(2)^ | | *yes* |
+  Ncurses interface
+
+| libcurl4-gnutls-dev | | *yes* |
+  URL transfer
+
+| zlib1g-dev | | *yes* |
+  Compression of packets in relay plugin (weechat protocol), script plugin
+
+| libgcrypt20-dev | | *yes* |
+  Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
+
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  SSL connection to IRC server, support of SSL in relay plugin,
+  IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  Internationalization (translation of messages; base language is English)
+
+| ca-certificates | | |
+  Certificates for SSL connections
+
+| libaspell-dev or libenchant-dev | | |
+  Aspell plugin
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  Python plugin
+
+| libperl-dev | | |
+  Perl plugin
+
+| ruby2.1-dev | ≥ 1.8 | |
+  Ruby plugin
+
+| liblua5.2-dev | | |
+  Lua plugin
+
+| tcl-dev | ≥ 8.5 | |
+  Tcl plugin
+
+| guile-2.0-dev | ≥ 2.0 | |
+  Guile (scheme) plugin
+
+| asciidoc | ≥ 8.5.0 | |
+  Build man page and documentation
+
+| source-highlight | | |
+  Syntax highlight for sources in documentation
+
+| xsltproc, docbook-xml, docbook-xsl | | |
+  Build of man page
+
+| libcpputest-dev | ≥ 3.4 | .2+|
+  Run tests
+
+| C++ compiler | |
 |===
 
 [NOTE]
@@ -118,7 +159,9 @@ compile WeeChat.
 names may be different in different distributions and versions. +
 ^(2)^ WeeChat can compile with libncurses5-dev, but it is *NOT* recommended (you
 will have display bugs with wide chars). +
-^(3)^ Recommended Python version is 2.7 (all scripts run fine with version 2.7,
+^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ Recommended Python version is 2.7 (all scripts run fine with version 2.7,
 but not with versions ≤ 2.6 or ≥ 3.0).
 
 [[compile_with_cmake]]
@@ -2186,6 +2229,48 @@ Options in servers are:
 * 'sasl_password': password
 * 'sasl_key': path to private key (for mechanism 'ecdsa-nist256p-challenge')
 
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+You must generate a private key in order to authentify with the
+ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+
+You can generate the key with this command:
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Get the public key (encoded as base64) with this command:
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connect to the server, identify (for example with "nickserv identify") and set
+your public key in your account, using nickserv (replace the base64 value with
+your public key):
+
+----
+/connect freenode
+/msg nickserv identify your_password
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configure the SASL options in the server:
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnect to the server:
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== Connect to Freenode with TOR/SASL
 
diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc
index de8579b0c..abeb373d1 100644
--- a/doc/fr/weechat_user.fr.asciidoc
+++ b/doc/fr/weechat_user.fr.asciidoc
@@ -90,37 +90,83 @@ compiler WeeChat.
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Paquet ^(1)^                    | Version     | Requis | Fonctionnalité
-| cmake                           |             | *oui*  | Construction (autotools toujours possible, mais cmake est recommandé)
-| pkg-config                      |             | *oui*  | Détection des bibliothèques installées
-| libncursesw5-dev ^(2)^          |             | *oui*  | Interface ncurses
-| libcurl4-gnutls-dev             |             | *oui*  | Transfert d'URL
-| zlib1g-dev                      |             | *oui*  | Compression des paquets dans l'extension relay (protocole weechat), extension script
-| libgcrypt20-dev                 |             | *oui*  | Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES), extension script
-| libgnutls28-dev                 | ≥ 2.2.0     |        | Connexion SSL au serveur IRC, support SSL dans l'extension relay, authentification IRC SASL (ECDSA-NIST256P-CHALLENGE)
-| gettext                         |             |        | Internationalisation (traduction des messages; la langue de base est l'anglais)
-| ca-certificates                 |             |        | Certificats pour les connexions SSL
-| libaspell-dev ou libenchant-dev |             |        | Extension aspell
-| python-dev                      | ≥ 2.5 ^(3)^ |        | Extension python
-| libperl-dev                     |             |        | Extension perl
-| ruby2.1-dev                     | ≥ 1.8       |        | Extension ruby
-| liblua5.2-dev                   |             |        | Extension lua
-| tcl-dev                         | ≥ 8.5       |        | Extension tcl
-| guile-2.0-dev                   | ≥ 2.0       |        | Extension guile (scheme)
-| asciidoc                        | ≥ 8.5.0     |        | Construction de la page man et de la documentation
-| source-highlight                |             |        | Coloration des sources dans la documentation
-| xsltproc,
-  docbook-xml, docbook-xsl        |             |        | Construction de la page de manuel
-| libcpputest-dev                 | ≥ 3.4       |     .2+| Lancement des tests
-| C++ compiler                    |             |
+| Paquet ^(1)^ | Version | Requis | Fonctionnalité
+
+| cmake | | *oui* |
+  Construction (autotools toujours possible, mais cmake est recommandé)
+
+| pkg-config | | *oui* |
+  Détection des bibliothèques installées
+
+| libncursesw5-dev ^(2)^ | | *oui* |
+  Interface ncurses
+
+| libcurl4-gnutls-dev | | *oui* |
+  Transfert d'URL
+
+| zlib1g-dev | | *oui* |
+  Compression des paquets dans l'extension relay (protocole weechat),
+  extension script
+
+| libgcrypt20-dev | | *oui* |
+  Données sécurisées, authentification IRC SASL (DH-BLOWFISH/DH-AES),
+  extension script
+
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  Connexion SSL au serveur IRC, support SSL dans l'extension relay,
+  authentification IRC SASL (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  Internationalisation (traduction des messages; la langue de base est
+  l'anglais)
+
+| ca-certificates | | |
+  Certificats pour les connexions SSL
+
+| libaspell-dev ou libenchant-dev | | |
+  Extension aspell
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  Extension python
+
+| libperl-dev | | |
+  Extension perl
+
+| ruby2.1-dev | ≥ 1.8 | |
+  Extension ruby
+
+| liblua5.2-dev | | |
+  Extension lua
+
+| tcl-dev | ≥ 8.5 | |
+  Extension tcl
+
+| guile-2.0-dev | ≥ 2.0 | |
+  Extension guile (scheme)
+
+| asciidoc | ≥ 8.5.0 | |
+  Construction de la page man et de la documentation
+
+| source-highlight | | |
+  Coloration des sources dans la documentation
+
+| xsltproc, docbook-xml, docbook-xsl | | |
+  Construction de la page de manuel
+
+| libcpputest-dev | ≥ 3.4 | .2+|
+  Lancement des tests
+
+| C++ compiler | |
 |===
 
 [NOTE]
 ^(1)^ Le nom provient de la distribution GNU/Linux Debian, la version dans le
 nom du paquet peut être différente. +
-^(2)^ WeeChat peut compiler avec libncurses5-dev, mais ce n'est *PAS* recommandé
-(vous aurez des bugs d'affichage avec les caractères larges). +
-^(3)^ La version recommandée de Python est 2.7 (tous les scripts tournent bien
+^(2)^ WeeChat peut compiler avec libncurses5-dev, mais ce n'est *PAS*
+recommandé (vous aurez des bugs d'affichage avec les caractères larges). +
+^(3)^ Gnutls ≥ 3.0.21 est requis pour l'authentification SASL avec le mécanisme
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ La version recommandée de Python est 2.7 (tous les scripts tournent bien
 avec la version 2.7, mais pas avec les versions ≤ 2.6 ou ≥ 3.0).
 
 [[compile_with_cmake]]
@@ -2242,7 +2288,6 @@ WeeChat supporte l'authentification avec SASL, en utilisant différents
 mécanismes :
 
 * 'plain' : mot de passe en clair (par défaut)
-// TRANSLATION MISSING
 * 'ecdsa-nist256p-challenge' : challenge avec clé publique/privée
 * 'external' : certificat SSL côté client
 * 'dh-blowfish' : mot de passe chiffré avec blowfish
@@ -2262,6 +2307,49 @@ Les options dans le serveur sont :
 * 'sasl_key' : chemin vers la clé privée (pour le mécanisme
   'ecdsa-nist256p-challenge')
 
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+Vous devez générer une clé privée pour vous authentifier avec le mécanisme
+ECDSA-NIST256P-CHALLENGE (aucun mot de passe n'est requis lors de la
+connexion).
+
+Vous pouvez générer la clé avec cette commande :
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Récupérez la clé publique (encodée en base64) avec cette commande :
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connectez-vous au serveur, identifiez vous (par exemple avec
+"nickserv identify") et définissez la clé publique dans votre compte, en
+utilisant nickserv (remplacez la valeur base64 par votre clé publique) :
+
+----
+/connect freenode
+/msg nickserv identify votre_mot_de_passe
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configurez les options SASL dans le serveur :
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "votre_pseudo"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnectez-vous au serveur :
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== Connexion à Freenode avec TOR/SASL
 
diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc
index 575cb4193..9255cbefc 100644
--- a/doc/it/weechat_user.it.asciidoc
+++ b/doc/it/weechat_user.it.asciidoc
@@ -101,44 +101,88 @@ compilare WeeChat.
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Pacchetto ^(1)^                | Versione    | Richiesto | Caratteristica
-| cmake                          |             | *sì*      | Compilazione (ancora possibile con autotools, ma si raccomanda cmake)
+| Pacchetto ^(1)^ | Versione | Richiesto | Caratteristica
+
+| cmake | | *sì* |
+  Compilazione (ancora possibile con autotools, ma si raccomanda cmake)
+
 // TRANSLATION MISSING
-| pkg-config                     |             | *sì*      | Detect installed libraries
-| libncursesw5-dev ^(2)^         |             | *sì*      | Interfaccia ncurses
-| libcurl4-gnutls-dev            |             | *sì*      | Trasferimento URL
+| pkg-config | | *sì* |
+  Detect installed libraries
+
+| libncursesw5-dev ^(2)^ | | *sì* |
+  Interfaccia ncurses
+
+| libcurl4-gnutls-dev | | *sì* |
+  Trasferimento URL
+
 // TRANSLATION MISSING
-| zlib1g-dev                     |             | *sì*      | Compression of packets in relay plugin (weechat protocol), script plugin
+| zlib1g-dev | | *sì* |
+  Compression of packets in relay plugin (weechat protocol), script plugin
+
 // TRANSLATION MISSING
-| libgcrypt20-dev                |             | *sì*      | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
+| libgcrypt20-dev | | *sì* |
+  Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin
+
 // TRANSLATION MISSING
-| libgnutls28-dev                | ≥ 2.2.0     |           | Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
-| gettext                        |             |           | Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese)
-| ca-certificates                |             |           | Certificati per le connessioni SSL
-| libaspell-dev o libenchant-dev |             |           | Plugin aspell
-| python-dev                     | ≥ 2.5 ^(3)^ |           | Plugin python
-| libperl-dev                    |             |           | Plugin perl
-| ruby2.1-dev                    | ≥ 1.8       |           | Plugin ruby
-| liblua5.2-dev                  |             |           | Plugin lua
-| tcl-dev                        | ≥ 8.5       |           | Plugin tcl
-| guile-2.0-dev                  | ≥ 2.0       |           | Plugin guile (scheme)
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  Connessione SSL al server IRC, support of SSL in relay plugin, IRC SASL
+  authentication (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese)
+
+| ca-certificates | | |
+  Certificati per le connessioni SSL
+
+| libaspell-dev o libenchant-dev | | |
+  Plugin aspell
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  Plugin python
+
+| libperl-dev | | |
+  Plugin perl
+
+| ruby2.1-dev | ≥ 1.8 | |
+  Plugin ruby
+
+| liblua5.2-dev | | |
+  Plugin lua
+
+| tcl-dev | ≥ 8.5 | |
+  Plugin tcl
+
+| guile-2.0-dev | ≥ 2.0 | |
+  Plugin guile (scheme)
+
 // TRANSLATION MISSING
-| asciidoc                       | ≥ 8.5.0     |           | Build man page and documentation
-| source-highlight               |             |           | Evidenziazione della sintassi per i sorgenti nella documentazione
+| asciidoc | ≥ 8.5.0 | |
+  Build man page and documentation
+
+| source-highlight | | |
+  Evidenziazione della sintassi per i sorgenti nella documentazione
+
 // TRANSLATION MISSING
-| xsltproc,
-  docbook-xml, docbook-xsl       |             |           | Build of man page
+| xsltproc, docbook-xml, docbook-xsl | | |
+  Build of man page
+
 // TRANSLATION MISSING
-| libcpputest-dev                | ≥ 3.4       |        .2+| Run tests
-| C++ compiler                   |             |
+| libcpputest-dev | ≥ 3.4 | .2+|
+  Run tests
+
+| C++ compiler | |
 |===
 
+// TRANSLATION MISSING (note 3)
 [NOTE]
 ^(1)^ Il nome viene dalla distribuzione Debian GNU/Linux, nomi e versioni dei pacchetti
 potrebbero essere differenti in versioni e distribuzioni differenti. +
 ^(2)^ WeeChat può essere compilato con libncurses5-dev, ma *NON* è raccomandato
 (potrebbero verificarsi bug di visualizzazione). +
-^(3)^ La versione raccomandata di Python è la 2.7 (tutti gli script funzionano
+^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ La versione raccomandata di Python è la 2.7 (tutti gli script funzionano
 correttamente con la versione 2.7, ma non con le versioni ≤ 2.6 o ≥ 3.0).
 
 [[compile_with_cmake]]
@@ -2301,6 +2345,49 @@ Le opzioni nel server sono:
 // TRANSLATION MISSING
 * 'sasl_key': path to private key (for mechanism 'ecdsa-nist256p-challenge')
 
+// TRANSLATION MISSING
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+You must generate a private key in order to authentify with the
+ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+
+You can generate the key with this command:
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Get the public key (encoded as base64) with this command:
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connect to the server, identify (for example with "nickserv identify") and set
+your public key in your account, using nickserv (replace the base64 value with
+your public key):
+
+----
+/connect freenode
+/msg nickserv identify your_password
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configure the SASL options in the server:
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnect to the server:
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== Connessione a Freenode con TOR/SASL
 
diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc
index c9045018d..0b0e23fd5 100644
--- a/doc/ja/weechat_user.ja.asciidoc
+++ b/doc/ja/weechat_user.ja.asciidoc
@@ -93,38 +93,81 @@ OS X では、http://brew.sh/[Homebrew] を使ってください:
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| パッケージ ^(1)^                    | バージョン  | 要件  | 機能
-| cmake                               |             | *必須* | ビルド (autotools でも可能ですが、cmake を推奨します)
-| pkg-config                          |             | *必須* | インストール済みライブラリを検出
-| libncursesw5-dev ^(2)^              |             | *必須* | ncurses インターフェイス
-| libcurl4-gnutls-dev                 |             | *必須* | URL 転送
-| zlib1g-dev                          |             | *必須* | relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
-| libgcrypt20-dev                     |             | *必須* | 保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)、スクリプトプラグイン
+| パッケージ ^(1)^ | バージョン | 要件 | 機能
+
+| cmake | | *必須* |
+  ビルド (autotools でも可能ですが、cmake を推奨します)
+
+| pkg-config | | *必須* |
+  インストール済みライブラリを検出
+
+| libncursesw5-dev ^(2)^ | | *必須* |
+  ncurses インターフェイス
+
+| libcurl4-gnutls-dev | | *必須* |
+  URL 転送
+
+| zlib1g-dev | | *必須* |
+  relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン
+
+| libgcrypt20-dev | | *必須* |
+  保護データ、IRC SASL 認証 (DH-BLOWFISH/DH-AES)、スクリプトプラグイン
+
 // TRANSLATION MISSING
-| libgnutls28-dev                     | ≥ 2.2.0     |       | IRC サーバへの SSL 接続, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
-| gettext                             |             |       | 国際化 (メッセージの翻訳; ベース言語は英語です)
-| ca-certificates                     |             |       | SSL 接続に必要な証明書、relay プラグインで SSL サポート
-| libaspell-dev または libenchant-dev |             |       | aspell プラグイン
-| python-dev                          | ≥ 2.5 ^(3)^ |       | python プラグイン
-| libperl-dev                         |             |       | perl プラグイン
-| ruby2.1-dev                         | ≥ 1.8       |       | ruby プラグイン
-| liblua5.2-dev                       |             |       | lua プラグイン
-| tcl-dev                             | ≥ 8.5       |       | tcl プラグイン
-| guile-2.0-dev                       | ≥ 2.0       |       | guile (scheme) プラグイン
-| asciidoc                            | ≥ 8.5.0     |       | man ページと文書のビルド
-| source-highlight                    |             |       | 文書中のソースに対するシンタックスハイライト
-| xsltproc,
-  docbook-xml, docbook-xsl            |             |       | man ページのビルド
-| libcpputest-dev                     | ≥ 3.4       |    .2+| テストの実行
-| C++ コンパイラ                      |             |
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  IRC サーバへの SSL 接続, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  国際化 (メッセージの翻訳; ベース言語は英語です)
+
+| ca-certificates | | |
+  SSL 接続に必要な証明書、relay プラグインで SSL サポート
+
+| libaspell-dev または libenchant-dev | | |
+  aspell プラグイン
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  python プラグイン
+
+| libperl-dev | | |
+  perl プラグイン
+
+| ruby2.1-dev | ≥ 1.8 | |
+  ruby プラグイン
+
+| liblua5.2-dev | | |
+  lua プラグイン
+
+| tcl-dev | ≥ 8.5 | |
+  tcl プラグイン
+
+| guile-2.0-dev | ≥ 2.0 | |
+  guile (scheme) プラグイン
+
+| asciidoc | ≥ 8.5.0 | |
+  man ページと文書のビルド
+
+| source-highlight | | |
+  文書中のソースに対するシンタックスハイライト
+
+| xsltproc, docbook-xml, docbook-xsl | | |
+  man ページのビルド
+
+| libcpputest-dev | ≥ 3.4 | .2+|
+  テストの実行
+
+| C++ コンパイラ | |
 |===
 
+// TRANSLATION MISSING (note 3)
 [NOTE]
 ^(1)^ Debian GNU/Linux ディストリビューションにおけるパッケージ名です。
 他のディストリビューションではバージョンとパッケージ名が異なるかもしれません。 +
 ^(2)^ WeeChat は libncurses5-dev でもコンパイル可能ですが、これは推奨*されません*
 (ワイドキャラクタの表示にバグを生じるでしょう)。 +
-^(3)^ Python はバージョン 2.7 をお勧めします (全てのスクリプトはバージョン 2.7
+^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ Python はバージョン 2.7 をお勧めします (全てのスクリプトはバージョン 2.7
 で正しく動きますが、バージョン 2.6 以下または 3.0 以上では正しく動きません)。
 
 [[compile_with_cmake]]
@@ -2194,6 +2237,49 @@ WeeChat のコンパイル時に必要です (<<dependencies,依存関係>>を
 // TRANSLATION MISSING
 * 'sasl_key': path to private key (for mechanism 'ecdsa-nist256p-challenge')
 
+// TRANSLATION MISSING
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+You must generate a private key in order to authentify with the
+ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+
+You can generate the key with this command:
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Get the public key (encoded as base64) with this command:
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connect to the server, identify (for example with "nickserv identify") and set
+your public key in your account, using nickserv (replace the base64 value with
+your public key):
+
+----
+/connect freenode
+/msg nickserv identify your_password
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configure the SASL options in the server:
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnect to the server:
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== TOR/SASL を使って Freenode に接続する場合
 
diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc
index 297c93aef..91cfe3941 100644
--- a/doc/pl/weechat_user.pl.asciidoc
+++ b/doc/pl/weechat_user.pl.asciidoc
@@ -94,37 +94,82 @@ WeeChat.
 
 [width="100%",cols="5,^3,^3,.^13",options="header"]
 |===
-| Pakiet ^(1)^                    | Wersja      | Wymagany | Opis
-| cmake                           |             | *tak*    | Kompilacja (możliwe jest użycie autotools, jednak cmake jest zalecany)
-| pkg-config                      |             | *tak*    | Wykrywa zainstalowane biblioteki
-| libncursesw5-dev ^(2)^          |             | *tak*    | Interfejs ncurses
-| libcurl4-gnutls-dev             |             | *tak*    | Transfer URL
-| zlib1g-dev                      |             | *tak*    | Kompresja pakietów we wtyczce relay (protokół weechat), wtyczka script
-| libgcrypt20-dev                 |             | *tak*    | Zabezpieczone dane, uwierzytelnianie IRC SASL (DH-BLOWFISH/DH-AES), wtyczka script
-| libgnutls28-dev                 | ≥ 2.2.0     |          | Połączenia SSL z serwerami IRC, wsparcie dla SSL we wtyczce relay, uwierzytelnianie IRC SASL (ECDSA-NIST256P-CHALLENGE)
-| gettext                         |             |          | Internacjonalizacja (tłumaczenie wiadomości; język bazowy to Angielski)
-| ca-certificates                 |             |          | Certyfikaty dla połączeń SSL
-| libaspell-dev or libenchant-dev |             |          | Wtyczka aspell
-| python-dev                      | ≥ 2.5 ^(3)^ |          | Wtyczka python
-| libperl-dev                     |             |          | Wtyczka perl
-| ruby2.1-dev                     | ≥ 1.8       |          | Wtyczka ruby
-| liblua5.2-dev                   |             |          | Wtyczka lua
-| tcl-dev                         | ≥ 8.5       |          | Wtyczka tcl
-| guile-2.0-dev                   | ≥ 2.0       |          | Wtyczka guile (scheme)
-| asciidoc                        | ≥ 8.5.0     |          | Tworzenie strony man i dokumentacji
-| source-highlight                |             |          | Podświetlanie składni dla kodów źródłowych w dokumentacji
-| xsltproc,
-  docbook-xml, docbook-xsl        |             |          | Tworzenie strony man
-| libcpputest-dev                 | ≥ 3.4       |       .2+| Uruchamianie testów
-| C++ compiler                    |             |
+| Pakiet ^(1)^ | Wersja | Wymagany | Opis
+
+| cmake | | *tak* |
+  Kompilacja (możliwe jest użycie autotools, jednak cmake jest zalecany)
+
+| pkg-config | | *tak* |
+  Wykrywa zainstalowane biblioteki
+
+| libncursesw5-dev ^(2)^ | | *tak* |
+  Interfejs ncurses
+
+| libcurl4-gnutls-dev | | *tak* |
+  Transfer URL
+
+| zlib1g-dev | | *tak* |
+  Kompresja pakietów we wtyczce relay (protokół weechat), wtyczka script
+
+| libgcrypt20-dev | | *tak* |
+  Zabezpieczone dane, uwierzytelnianie IRC SASL (DH-BLOWFISH/DH-AES), wtyczka
+  script
+
+| libgnutls28-dev | ≥ 2.2.0 ^(3)^ | |
+  Połączenia SSL z serwerami IRC, wsparcie dla SSL we wtyczce relay,
+  uwierzytelnianie IRC SASL (ECDSA-NIST256P-CHALLENGE)
+
+| gettext | | |
+  Internacjonalizacja (tłumaczenie wiadomości; język bazowy to Angielski)
+
+| ca-certificates | | |
+  Certyfikaty dla połączeń SSL
+
+| libaspell-dev or libenchant-dev | | |
+  Wtyczka aspell
+
+| python-dev | ≥ 2.5 ^(4)^ | |
+  Wtyczka python
+
+| libperl-dev | | |
+  Wtyczka perl
+
+| ruby2.1-dev | ≥ 1.8 | |
+  Wtyczka ruby
+
+| liblua5.2-dev | | |
+  Wtyczka lua
+
+| tcl-dev | ≥ 8.5 | |
+  Wtyczka tcl
+
+| guile-2.0-dev | ≥ 2.0 | |
+  Wtyczka guile (scheme)
+
+| asciidoc | ≥ 8.5.0 | |
+  Tworzenie strony man i dokumentacji
+
+| source-highlight | | |
+  Podświetlanie składni dla kodów źródłowych w dokumentacji
+
+| xsltproc, docbook-xml, docbook-xsl | | |
+  Tworzenie strony man
+
+| libcpputest-dev | ≥ 3.4 | .2+|
+  Uruchamianie testów
+
+| C++ compiler | |
 |===
 
+// TRANSLATION MISSING (note 3)
 [NOTE]
 ^(1)^ Nazwy pochodzą z dystrybucji Debian GNU/Linux, wersje i nazwy pakietów
 mogą być inne w innych dystrybucjach. +
 ^(2)^ WeeChat może być skompilowany z libncurses5-dev, ale jest to *NIE*
 zalecane (spowoduje to błędy w wyświetlaniu szerokich znaków). +
-^(3)^ Zalecana wersja Pythona to 2.7 (wszystkie skrypty działają z wersją 2.7,
+^(3)^ Gnutls ≥ 3.0.21 is required for IRC SASL authentication with mechanism
+ECDSA-NIST256P-CHALLENGE. +
+^(4)^ Zalecana wersja Pythona to 2.7 (wszystkie skrypty działają z wersją 2.7,
 ale nie w wersjami ≤ 2.6 lub ≥ 3.0).
 
 [[compile_with_cmake]]
@@ -2210,6 +2255,49 @@ Opcje dla serwerów to:
 // TRANSLATION MISSING
 * 'sasl_key': path to private key (for mechanism 'ecdsa-nist256p-challenge')
 
+// TRANSLATION MISSING
+[[irc_sasl_ecdsa_nist256p_challenge]]
+===== SASL ECDSA-NIST256P-CHALLENGE
+
+You must generate a private key in order to authentify with the
+ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
+
+You can generate the key with this command:
+
+----
+$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+----
+
+Get the public key (encoded as base64) with this command:
+
+----
+$ openssl ec -noout -text -conv_form compressed -in ~/.weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+----
+
+Connect to the server, identify (for example with "nickserv identify") and set
+your public key in your account, using nickserv (replace the base64 value with
+your public key):
+
+----
+/connect freenode
+/msg nickserv identify your_password
+/msg nickserv set pubkey Av8k1FOGetUDq7sPMBfufSIZ5c2I/QYWgiwHtNXkVe/q
+----
+
+Configure the SASL options in the server:
+
+----
+/set irc.server.freenode.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.freenode.sasl_username "your_nickname"
+/set irc.server.freenode.sasl_key "%h/ecdsa.pem"
+----
+
+Reconnect to the server:
+
+----
+/reconnect freenode
+----
+
 [[irc_tor_freenode]]
 ==== Połączenie z siecią Freenode za pomocą TOR/SASL