diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index ba3276109..fcc964474 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -31,6 +31,7 @@ Improvements::
   * core: allow index for hdata arrays in evaluation of expressions
   * buflist: display a warning when the script "buffers.pl" is loaded
   * buflist: add support of char "~" in option buflist.look.sort for case insensitive comparison
+  * buflist: add variable `${format_name}` in bar item evaluation and option buflist.format.name (issue #1020)
   * buflist: add variables `${current_buffer}` and `${merged}` (booleans "0" / "1") in bar item evaluation
   * relay: add option "start" in command /relay
   * trigger: add "irc_server" and "irc_channel" pointers in data for IRC signal/modifier hooks
diff --git a/doc/de/autogen/user/buflist_commands.adoc b/doc/de/autogen/user/buflist_commands.adoc
index fb13e73e0..66234b7af 100644
--- a/doc/de/autogen/user/buflist_commands.adoc
+++ b/doc/de/autogen/user/buflist_commands.adoc
@@ -9,38 +9,39 @@
 /buflist  bar
           refresh
 
-    bar: fügt eine "buflist" Bar hinzu
-refresh: erzwingt eine Aktualisierung des "buflist" Bar-Item
+    bar: add the "buflist" bar
+refresh: force the refresh of the "buflist" bar item
 
-Jede Zeile die einen Buffer anzeigt wird mittels Zeichenketten-Evaluation dargestellt (siehe /help eval für das Format), dazu werden folgende Optionen genutzt:
-  - buflist.look.display_conditions: Bedingungen um einen Buffer in der Liste darzustellen
-  - buflist.format.buffer: Format für den Buffer, der nicht der aktuell dargestellte Buffer ist
-  - buflist.format.buffer_current: Format für den aktuell dargestellten Buffer
+The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options:
+  - buflist.look.display_conditions: conditions to display a buffer in the list
+  - buflist.format.buffer: format for a buffer which is not current buffer
+  - buflist.format.buffer_current: format for the current buffer
 
-Die folgenden Variablen können in den obigen Optionen genutzt werden:
-  - buffer data (siehe hdata "buffer" in API Dokumentation für eine vollständige Liste), zum Beispiel:
+The following variables can be used in these options:
+  - buffer data (see hdata "buffer" in API doc for a complete list), for example:
     - ${buffer.number}
     - ${buffer.name}
     - ${buffer.full_name}
     - ${buffer.short_name}
     - ${buffer.nicklist_nicks_count}
-  - irc_server: IRC Serverdaten, ausschließlich genutzt bei einem IRC Buffer (siehe hdata "irc_server" in API Dokumentation)
-  - irc_channel: IRC Channeldaten, ausschließlich genutzt bei einem IRC Channel Buffer (siehe hdata "irc_channel" in API Dokumentation)
-  - zusätzliche Variablen die durch buflist bereitgestellt werden:
-    - ${format_buffer}: der evaluierte Wert der Option buflist.format.buffer; dies kann in der Option buflist.format.buffer_current genutzt werden um zum Beispiel die Hintergrundfarbe zu verändern
-    - ${current_buffer}: ein Boolean ("0" oder "1"), "1" falls es sich um den aktuellen Buffer handelt; dies kann in einer Bedingung verwendet werden: ${if:${current_buffer}?...:...}
-    - ${merged}: ein Boolean ("0" oder "1"), "1" wenn der Buffer mit einem anderen zusammengefügt ist; kann innerhalb einer Bedingung genutzt werden: ${if:${merged}?...:...}
-    - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert aus Option buflist.format.number)
-    - ${number}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt
-    - ${number_displayed}: "1" falls Nummer angezeigt wird, ansonsten "0"
-    - ${indent}: Einrückung für Name (Channel und private Buffer werden eingerückt) (evaluiert aus Option buflist.format.indent)
-    - ${format_nick_prefix}: Nick-Präfix mit entsprechender Farbe für einen Channel (evaluiert aus  Option buflist.format.nick_prefix)
-    - ${color_nick_prefix}: Farbe für den Nick-Präfix von einem Channel (wird nur genutzt wenn die Option buflist.look.nick_prefix aktiviert ist)
-    - ${nick_prefix}: der Nick-Präfix für einen Channel (wird nur genutzt falls die Option buflist.look.nick_prefix aktiviert ist)
-    - ${name}: der Kurzname (falls einer gesetzt ist), Ersatzweise wird auf den Originalnamen zurückgegriffen
-    - ${color_hotlist}: die Farbe mit der höchsten Priorität für den entsprechenden Buffer  (evaluiert aus Option buflist.format.hotlist_xxx wobei xxx der entsprechende Level ist)
-    - ${format_hotlist}: die formatierte Hotlist (evaluiert aus Option buflist.format.hotlist)
-    - ${hotlist}: die Hotlist in der Rohform
-    - ${hotlist_priority}: "none", "low", "message", "private" oder "highlight"
-    - ${format_lag}: die Verzögerung für einen IRC Server-Buffer, ist leer falls es keine Verzögerung gibt (evaluiert aus Option buflist.format.lag)
+  - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc)
+  - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc)
+  - extra variables added by buflist for convenience:
+    - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example
+    - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...}
+    - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...}
+    - ${format_number}: indented number with separator (evaluation of option buflist.format.number)
+    - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers
+    - ${number_displayed}: "1" if the number is displayed, otherwise "0"
+    - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent)
+    - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
+    - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${format_name}: formatted name (evaluation of option buflist.format.name)
+    - ${name}: the short name (if set), with a fallback on the name
+    - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
+    - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist)
+    - ${hotlist}: the raw hotlist
+    - ${hotlist_priority}: "none", "low", "message", "private" or "highlight"
+    - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag)
 ----
diff --git a/doc/de/autogen/user/buflist_options.adoc b/doc/de/autogen/user/buflist_options.adoc
index 6179e5cbb..ab4f3dada 100644
--- a/doc/de/autogen/user/buflist_options.adoc
+++ b/doc/de/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
-** Standardwert: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** Standardwert: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** Beschreibung: pass:none[Format für die Zeile mit dem ausgewählten Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)]
@@ -68,6 +68,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** Beschreibung: pass:none[format for buffer name (note: content is evaluated, see /help buflist)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette
+** Standardwert: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** Beschreibung: pass:none[Format des Nick-Präfix für einen Channel (Hinweis: Inhalt wird evaluiert, siehe /help buflist)]
 ** Typ: Zeichenkette
diff --git a/doc/en/autogen/user/buflist_commands.adoc b/doc/en/autogen/user/buflist_commands.adoc
index 277fcc063..65c80ea58 100644
--- a/doc/en/autogen/user/buflist_commands.adoc
+++ b/doc/en/autogen/user/buflist_commands.adoc
@@ -37,6 +37,7 @@ The following variables can be used in these options:
     - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
     - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
     - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${format_name}: formatted name (evaluation of option buflist.format.name)
     - ${name}: the short name (if set), with a fallback on the name
     - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
     - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist)
diff --git a/doc/en/autogen/user/buflist_options.adoc b/doc/en/autogen/user/buflist_options.adoc
index 5cc2cefc3..490e6d2de 100644
--- a/doc/en/autogen/user/buflist_options.adoc
+++ b/doc/en/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** description: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)]
 ** type: string
 ** values: any string
-** default value: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** default value: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** description: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)]
@@ -68,6 +68,12 @@
 ** values: any string
 ** default value: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** description: pass:none[format for buffer name (note: content is evaluated, see /help buflist)]
+** type: string
+** values: any string
+** default value: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** description: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)]
 ** type: string
diff --git a/doc/fr/autogen/user/buflist_commands.adoc b/doc/fr/autogen/user/buflist_commands.adoc
index 9d4900395..27b7c8e3d 100644
--- a/doc/fr/autogen/user/buflist_commands.adoc
+++ b/doc/fr/autogen/user/buflist_commands.adoc
@@ -37,6 +37,7 @@ Les variables suivantes peuvent être utilisées dans ces options :
     - ${format_nick_prefix} : le préfixe du pseudo en couleur pour un canal (évaluation de l'option buflist.format.nick_prefix)
     - ${color_nick_prefix} : la couleur du préfixe du pseudo pour un canal (défini seulement si l'option buflist.look.nick_prefix est activée)
     - ${nick_prefix} : le préfixe du pseudo pour un canal (défini seulement si l'option buflist.look.nick_prefix est activée)
+    - ${format_name} : le nom formaté (évaluation de l'option buflist.format.name)
     - ${name} : le nom court (si défini), sinon le nom
     - ${color_hotlist} : la couleur qui dépend du niveau de hotlist le plus élevé pour le tampon (évaluation de l'option buflist.format.hotlist_xxx où xxx est le niveau)
     - ${format_hotlist} : la hotlist formatée (évaluation de l'option buflist.format.hotlist)
diff --git a/doc/fr/autogen/user/buflist_options.adoc b/doc/fr/autogen/user/buflist_options.adoc
index b518bcd43..33d381c87 100644
--- a/doc/fr/autogen/user/buflist_options.adoc
+++ b/doc/fr/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** description: pass:none[format pour chaque ligne avec un tampon (note : le contenu est évalué, voir /help buflist)]
 ** type: chaîne
 ** valeurs: toute chaîne
-** valeur par défaut: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** valeur par défaut: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** description: pass:none[format pour la ligne avec le tampon courant (note : le contenu est évalué, voir /help buflist)]
@@ -68,6 +68,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** description: pass:none[format pour le nom du tampon (note : le contenu est évalué, voir /help buflist)]
+** type: chaîne
+** valeurs: toute chaîne
+** valeur par défaut: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** description: pass:none[format pour un préfixe de pseudo sur un canal (note : le contenu est évalué, voir /help buflist)]
 ** type: chaîne
diff --git a/doc/it/autogen/user/buflist_commands.adoc b/doc/it/autogen/user/buflist_commands.adoc
index 277fcc063..65c80ea58 100644
--- a/doc/it/autogen/user/buflist_commands.adoc
+++ b/doc/it/autogen/user/buflist_commands.adoc
@@ -37,6 +37,7 @@ The following variables can be used in these options:
     - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
     - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
     - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${format_name}: formatted name (evaluation of option buflist.format.name)
     - ${name}: the short name (if set), with a fallback on the name
     - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
     - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist)
diff --git a/doc/it/autogen/user/buflist_options.adoc b/doc/it/autogen/user/buflist_options.adoc
index bedc45859..efa2e84c5 100644
--- a/doc/it/autogen/user/buflist_options.adoc
+++ b/doc/it/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** descrizione: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)]
 ** tipo: stringa
 ** valori: qualsiasi stringa
-** valore predefinito: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** valore predefinito: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** descrizione: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)]
@@ -68,6 +68,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** descrizione: pass:none[format for buffer name (note: content is evaluated, see /help buflist)]
+** tipo: stringa
+** valori: qualsiasi stringa
+** valore predefinito: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** descrizione: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)]
 ** tipo: stringa
diff --git a/doc/ja/autogen/user/buflist_commands.adoc b/doc/ja/autogen/user/buflist_commands.adoc
index dd4b40432..5076c0d17 100644
--- a/doc/ja/autogen/user/buflist_commands.adoc
+++ b/doc/ja/autogen/user/buflist_commands.adoc
@@ -9,38 +9,39 @@
 /buflist  bar
           refresh
 
-    bar: "buflist" バーを追加します
-refresh: 強制的に "buflist" バー要素の内容を最新の状態に更新します
+    bar: add the "buflist" bar
+refresh: force the refresh of the "buflist" bar item
 
-各バッファエントリは文字列評価 (書式は /help eval を参照してください) を使って表示されます、以下のオプションで指定します:
-  - buflist.look.display_conditions: バッファをリスト内に表示する条件
-  - buflist.format.buffer: 現在のバッファ以外のバッファを表示する書式
-  - buflist.format.buffer_current: 現在のバッファを表示する書式
+The lines with buffers are displayed using string evaluation (see /help eval for the format), with these options:
+  - buflist.look.display_conditions: conditions to display a buffer in the list
+  - buflist.format.buffer: format for a buffer which is not current buffer
+  - buflist.format.buffer_current: format for the current buffer
 
-以下は上記オプションで使用可能な変数です:
-  - バッファデータ (完全なリストは API リファレンスの hdata "buffer" を参照してください)、例:
+The following variables can be used in these options:
+  - buffer data (see hdata "buffer" in API doc for a complete list), for example:
     - ${buffer.number}
     - ${buffer.name}
     - ${buffer.full_name}
     - ${buffer.short_name}
     - ${buffer.nicklist_nicks_count}
-  - irc_server: IRC サーバデータ、IRC バッファのみで定義 (API リファレンスの hdata "irc_server" を参照してください)
-  - irc_channel: IRC チャンネルデータ、IRC チャンネルバッファのみで定義 (API リファレンスの hdata "irc_channel" を参照してください)
-  - buflist プラグインが利便性向上の目的で追加した変数:
-    - ${format_buffer}: buflist.format.buffer オプションの評価結果; 例えば単に背景色を変えるなどの目的で、この変数を buflist.format.buffer_current オプションの中で使うことも可能です。
-    - ${current_buffer}: ブール値 ("0" または "1")、対象のバッファが現在のバッファの場合に "1"; 次のように条件中で使うことができます: ${if:${current_buffer}?...:...}
-    - ${merged}: ブール値 ("0" または "1")、対象のバッファが他のバッファとマージされていた場合に "1"; 次のように条件中で使うことができます: ${if:${merged}?...:...}
-    - ${format_number}: 区切り文字を付けたインデント済み番号 (buflist.format.number オプションの評価結果)
-    - ${number}: インデント済み番号、例えば 10 から 99 番のバッファがある場合に " 1"
-    - ${number_displayed}: 番号が表示される場合に "1"、それ以外の場合に "0"
-    - ${indent}: 名前用のインデント (チャンネルとプライベートバッファがインデントされます)
-    - ${format_nick_prefix}: チャンネルにおける色付きニックネームプレフィックス (buflist.format.nick_prefix オプションの評価結果)
-    - ${color_nick_prefix}: チャンネルにおけるニックネームプレフィックスの色 (buflist.look.nick_prefix オプションが有効化された場合のみ設定されます)
-    - ${nick_prefix}: チャンネルにおけるニックネームプレフィックス (buflist.look.nick_prefix オプションが有効化された場合のみ設定されます)
-    - ${name}: 短縮名 (設定済みの場合)、未設定の場合には名前
-    - ${color_hotlist}: 対象バッファのホットリストレベルの最大値に対応する色 (buflist.format.hotlist_xxx オプションの評価結果、xxx がレベル)
-    - ${format_hotlist}: 評価後のホットリスト (buflist.format.hotlist オプションの評価結果)
-    - ${hotlist}: 評価前のホットリスト
-    - ${hotlist_priority}: "none"、"low"、"message"、"private"、"highlight"
-    - ${format_lag}: IRC サーババッファの遅延時間、遅延がない場合は空 (buflist.format.lag オプションの評価結果)
+  - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc)
+  - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc)
+  - extra variables added by buflist for convenience:
+    - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example
+    - ${current_buffer}: a boolean ("0" or "1"), "1" if this is the current buffer; it can be used in a condition: ${if:${current_buffer}?...:...}
+    - ${merged}: a boolean ("0" or "1"), "1" if the buffer is merged with at least another buffer; it can be used in a condition: ${if:${merged}?...:...}
+    - ${format_number}: indented number with separator (evaluation of option buflist.format.number)
+    - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers
+    - ${number_displayed}: "1" if the number is displayed, otherwise "0"
+    - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent)
+    - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
+    - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${format_name}: formatted name (evaluation of option buflist.format.name)
+    - ${name}: the short name (if set), with a fallback on the name
+    - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
+    - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist)
+    - ${hotlist}: the raw hotlist
+    - ${hotlist_priority}: "none", "low", "message", "private" or "highlight"
+    - ${format_lag}: the lag for an IRC server buffer, empty if there's no lag (evaluation of option buflist.format.lag)
 ----
diff --git a/doc/ja/autogen/user/buflist_options.adoc b/doc/ja/autogen/user/buflist_options.adoc
index 39dd94dce..232063997 100644
--- a/doc/ja/autogen/user/buflist_options.adoc
+++ b/doc/ja/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** 説明: pass:none[各バッファの表示書式 (注意: 値は評価されます、/help eval を参照してください)]
 ** タイプ: 文字列
 ** 値: 未制約文字列
-** デフォルト値: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** デフォルト値: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** 説明: pass:none[現在のバッファの表示書式 (注意: 値は評価されます、/help eval を参照してください)]
@@ -68,6 +68,12 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** 説明: pass:none[format for buffer name (note: content is evaluated, see /help buflist)]
+** タイプ: 文字列
+** 値: 未制約文字列
+** デフォルト値: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** 説明: pass:none[チャンネルにおけるニックネームプレフィックス書式 (注意: 値は評価されます、/help buflist を参照してください)]
 ** タイプ: 文字列
diff --git a/doc/pl/autogen/user/buflist_commands.adoc b/doc/pl/autogen/user/buflist_commands.adoc
index 82505e76b..3a5bb1487 100644
--- a/doc/pl/autogen/user/buflist_commands.adoc
+++ b/doc/pl/autogen/user/buflist_commands.adoc
@@ -37,6 +37,7 @@ The following variables can be used in these options:
     - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
     - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
     - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
+    - ${format_name}: formatted name (evaluation of option buflist.format.name)
     - ${name}: the short name (if set), with a fallback on the name
     - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
     - ${format_hotlist}: the formatted hotlist (evaluation of option buflist.format.hotlist)
diff --git a/doc/pl/autogen/user/buflist_options.adoc b/doc/pl/autogen/user/buflist_options.adoc
index 4731437bb..044883db5 100644
--- a/doc/pl/autogen/user/buflist_options.adoc
+++ b/doc/pl/autogen/user/buflist_options.adoc
@@ -6,7 +6,7 @@
 ** opis: pass:none[format każdej linii w buforze (uwaga: zawartość jest przetwarzana, zobacz /help buflist)]
 ** typ: ciąg
 ** wartości: dowolny ciąg
-** domyślna wartość: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
+** domyślna wartość: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** opis: pass:none[format linii z obecnym buforem (uwaga: zawartość jest przetwarzana, zobacz /help buflist)]
@@ -68,6 +68,12 @@
 ** wartości: dowolny ciąg
 ** domyślna wartość: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.name]] *buflist.format.name*
+** opis: pass:none[format for buffer name (note: content is evaluated, see /help buflist)]
+** typ: ciąg
+** wartości: dowolny ciąg
+** domyślna wartość: `+"${name}"+`
+
 * [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
 ** opis: pass:none[format dla prefiksu nicka na kanale (uwaga: zawartość jest przetwarzana, zobacz /help buflist)]
 ** typ: ciąg
diff --git a/po/cs.po b/po/cs.po
index 989bbf2f5..ffd93225f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-05-13 22:06+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -4963,6 +4963,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5102,6 +5104,10 @@ msgid ""
 "help buflist)"
 msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -11711,21 +11717,3 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "příkazy definované pluginy"
-
-#~ msgid "weechat commands"
-#~ msgstr "příkazy weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "příkazy (weechat a pluginů)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "spřáva ladění pro jádro/pluginy"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "barva textu přezdívky v okně rozhovoru"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: odstraňuji starou fifo rouru \"%s\""
diff --git a/po/de.po b/po/de.po
index 158735d87..d46dbb6ff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
 "PO-Revision-Date: 2017-06-15 09:30+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -5812,6 +5812,7 @@ msgstr ""
 msgid "bar item with list of buffers"
 msgstr "Bar-Item mit der Liste von Buffern"
 
+#, fuzzy
 msgid ""
 "    bar: add the \"buflist\" bar\n"
 "refresh: force the refresh of the \"buflist\" bar item\n"
@@ -5859,6 +5860,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -6105,6 +6108,12 @@ msgstr ""
 "Format für die Anzeige der Verzögerungsanzeige für IRC Serverbuffer "
 "(Hinweis: Inhalt wird evaluiert, siehe /help buflist)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"Format für Buffer die nicht in der Hotlist angezeigt werden (Hinweis: Inhalt "
+"wird evaluiert, siehe /help buflist)"
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
diff --git a/po/es.po b/po/es.po
index 963eef1eb..de980e532 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-01-06 22:01+0100\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: es\n"
@@ -5177,6 +5177,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5316,6 +5318,10 @@ msgid ""
 "help buflist)"
 msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -11977,21 +11983,3 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse al transmisor"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "comandos definidos por plugins"
-
-#~ msgid "weechat commands"
-#~ msgstr "comandos de weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "comandos (weechat y plugins)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "controla los mensajes de depuración para el núcleo/plugins"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "color para los apodos en la ventana de conversación"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: removiendo vieja tubería fifo \"%s\""
diff --git a/po/fr.po b/po/fr.po
index e5dbeb561..ac130547e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-06-13 21:17+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -5729,6 +5729,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5788,6 +5790,8 @@ msgstr ""
 "(défini seulement si l'option buflist.look.nick_prefix est activée)\n"
 "    - ${nick_prefix} : le préfixe du pseudo pour un canal (défini seulement "
 "si l'option buflist.look.nick_prefix est activée)\n"
+"    - ${format_name} : le nom formaté (évaluation de l'option buflist.format."
+"name)\n"
 "    - ${name} : le nom court (si défini), sinon le nom\n"
 "    - ${color_hotlist} : la couleur qui dépend du niveau de hotlist le plus "
 "élevé pour le tampon (évaluation de l'option buflist.format.hotlist_xxx où "
@@ -5969,6 +5973,11 @@ msgstr ""
 "format pour le lag sur un tampon de serveur IRC (note : le contenu est "
 "évalué, voir /help buflist)"
 
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"format pour le nom du tampon (note : le contenu est évalué, voir /help "
+"buflist)"
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
@@ -13200,46 +13209,3 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
-
-#~ msgid ""
-#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
-#~ "script.scripts.url_force_https"
-#~ msgstr ""
-#~ "URL pour le fichier avec la liste des scripts ; par défaut HTTPS est "
-#~ "forcé, voir l'option script.scripts.url_force_https"
-
-#~ msgid ""
-#~ "force use of HTTPS for downloads (index and scripts); you should disable "
-#~ "this option only if you have problems with the downloads"
-#~ msgstr ""
-#~ "forcer l'utilisation de HTTPS pour les téléchargements (index et "
-#~ "scripts) ; vous ne devriez désactiver cette option que si vous avez des "
-#~ "problèmes avec les téléchargements"
-
-#~ msgid ""
-#~ "jump to previous/next visited buffer if you click with left/right mouse "
-#~ "button on line with current buffer"
-#~ msgstr ""
-#~ "sauter au tampon visité avant/après si vous cliquez avec le bouton gauche/"
-#~ "droit de la souris sur la ligne avec le tampon courant"
-
-#~ msgid "\"days\" (optional: just return the number of days)"
-#~ msgstr "\"days\" (optionnel : retourner juste le nombre de jours)"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "commandes définies par les extensions"
-
-#~ msgid "weechat commands"
-#~ msgstr "commandes weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "commandes (weechat et extensions)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "contrôle du debug pour le cœur/les extensions"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "couleur du texte pour les pseudos dans la fenêtre de discussion"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s : suppression du vieux tube \"%s\""
diff --git a/po/hu.po b/po/hu.po
index f513d85f2..6234d2d06 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-01-06 22:03+0100\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: hu\n"
@@ -4501,6 +4501,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -4638,6 +4640,10 @@ msgid ""
 "help buflist)"
 msgstr "felhasználónév az IRC szerveren"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr "felhasználónév az IRC szerveren"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -11005,23 +11011,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
-
-#, fuzzy
-#~ msgid "commands defined by plugins"
-#~ msgstr "  (nem található bővítőmodul)\n"
-
-#, fuzzy
-#~ msgid "weechat commands"
-#~ msgstr "%s belső parancsok:\n"
-
-#, fuzzy
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "  (nem található bővítőmodul)\n"
-
-#, fuzzy
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "idő színe a beszédablakban"
-
-#, fuzzy
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s nincs elég memória az információs pult üzenethez\n"
diff --git a/po/it.po b/po/it.po
index 2d0cf38b8..840f5687d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-01-06 22:04+0100\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: it\n"
@@ -5315,6 +5315,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5476,6 +5478,12 @@ msgstr ""
 "password per il server (nota: il contenuto viene valutato, consultare /help "
 "eval)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"nome utente per il server proxy (nota: il contenuto viene valutato, "
+"consultare /help eval)"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -12190,21 +12198,3 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "comandi definiti dai plugin"
-
-#~ msgid "weechat commands"
-#~ msgstr "comandi di weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "comandi (weechat e plugin)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "attiva debug per core/plugin"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "colore del testo per i nick nella finestra di chat"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: rimozione della pipe fifo %s precedente"
diff --git a/po/ja.po b/po/ja.po
index 665e7659a..822f9c8a4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-06-15 09:00+0900\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -5417,6 +5417,7 @@ msgstr ""
 msgid "bar item with list of buffers"
 msgstr "バッファのリストを表示するバー要素"
 
+#, fuzzy
 msgid ""
 "    bar: add the \"buflist\" bar\n"
 "refresh: force the refresh of the \"buflist\" bar item\n"
@@ -5464,6 +5465,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5699,6 +5702,12 @@ msgstr ""
 "IRC サーババッファの遅延時間の表示書式 (注意: 値は評価されます、/help eval を"
 "参照してください)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"ホットリストにないバッファの表示書式 (注意: 値は評価されます、/help eval を参"
+"照してください)"
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
@@ -12693,35 +12702,3 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
-
-#~ msgid ""
-#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
-#~ "script.scripts.url_force_https"
-#~ msgstr ""
-#~ "スクリプトのリストを含むファイルの URL; デフォルトは強制的に HTTPS を使"
-#~ "用、オプション script.scripts.url_force_https を参照"
-
-#~ msgid ""
-#~ "force use of HTTPS for downloads (index and scripts); you should disable "
-#~ "this option only if you have problems with the downloads"
-#~ msgstr ""
-#~ "ダウンロード (インデックスおよびスクリプト) の際に HTTPS を使うことを強制"
-#~ "する; ダウンロードに問題がある場合のみこのオプションを無効化してください"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "プラグインの定義するコマンド"
-
-#~ msgid "weechat commands"
-#~ msgstr "weechat コマンド"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "コマンド (weechat とプラグイン)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "core やプラグインのデバッグ管理"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "チャットウィンドウ内のニックネームのテキスト色"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: 古い fifo パイプ \"%s\" の削除中"
diff --git a/po/pl.po b/po/pl.po
index e0203d5a9..6a3eae127 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-04-08 14:49+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pl\n"
@@ -5595,6 +5595,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5810,6 +5812,12 @@ msgstr ""
 "format dla opóźnienia dla buforu serwera IRC (uwaga: zawartość jest "
 "przetwarzana, zobacz /help buflist)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"format dla bufora niw znajdującego się na hotliście (uwaga: zawartość jest "
+"przetwarzana, zobacz /help buflist)"
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
@@ -12904,35 +12912,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
-
-#~ msgid ""
-#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
-#~ "script.scripts.url_force_https"
-#~ msgstr ""
-#~ "adres pliku z listą skryptów; domyśłnie wymuszany jest protokół HTTPS, "
-#~ "zobacz opcje script.scripts.url_force_https"
-
-#~ msgid ""
-#~ "force use of HTTPS for downloads (index and scripts); you should disable "
-#~ "this option only if you have problems with the downloads"
-#~ msgstr ""
-#~ "wymusza użycie HTTPS do pobierania (listy i skryptów); powinieneś "
-#~ "wyłączyć tą opcję tylko jeśli występują problemy z pobieraniem"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "komendy zdefiniowane przez wtyczki"
-
-#~ msgid "weechat commands"
-#~ msgstr "komendy WeeChat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "komendy (weechata i wtyczek)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "kontrola debugu dla rdzenia/wtyczek"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "kolor nicków w oknie rozmowy"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: usuwam stary strumień fifo \"%s\""
diff --git a/po/pt.po b/po/pt.po
index 181c1f256..74db4fc8d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-04-08 14:50+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -5571,6 +5571,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5725,6 +5727,12 @@ msgid ""
 msgstr ""
 "palavra-passe para o servidor (nota: o conteúdo é avaliado, ver /help eval)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"nome de utilizador para usar no servidor (nota: o conteúdo é avaliado, ver /"
+"help eval)"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -12823,35 +12831,3 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
-
-#~ msgid ""
-#~ "URL for file with list of scripts; by default HTTPS is forced, see option "
-#~ "script.scripts.url_force_https"
-#~ msgstr ""
-#~ "URL do ficheiro com a lista de scripts; por omissão é forçado HTTPS, ver "
-#~ "a opção script.scripts.url_force_https"
-
-#~ msgid ""
-#~ "force use of HTTPS for downloads (index and scripts); you should disable "
-#~ "this option only if you have problems with the downloads"
-#~ msgstr ""
-#~ "forçar uso de HTTPS para transferir (índice e scripts); deve desativar "
-#~ "esta opção apenas se tem problemas com as transferências"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "comandos definidos por plugins"
-
-#~ msgid "weechat commands"
-#~ msgstr "comandos do weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "comandos (weechat e plugins)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "controlar depuração do core/plugins"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "cor do texto dos nicks na janela de chat"
-
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s: a remover o pipe fifo antigo \"%s\""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f3275bc9b..4002a2ddc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2016-09-03 08:24+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pt_BR\n"
@@ -5117,6 +5117,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -5278,6 +5280,12 @@ msgstr ""
 "comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
 "(nota: conteúdo é avaliado, veja /help eval)"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
+"(nota: conteúdo é avaliado, veja /help eval)"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -11478,18 +11486,3 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
-
-#~ msgid "commands defined by plugins"
-#~ msgstr "comandos definidos por plugins"
-
-#~ msgid "weechat commands"
-#~ msgstr "comandos do weechat"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "comandos (weechat e plugins)"
-
-#~ msgid "control debug for core/plugins"
-#~ msgstr "controlar depuração para core/plugins"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "cor do texto para apelidos na janela de conversa"
diff --git a/po/ru.po b/po/ru.po
index 6d616c768..db213cd66 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-01-06 22:06+0100\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: ru\n"
@@ -4539,6 +4539,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -4676,6 +4678,10 @@ msgid ""
 "help buflist)"
 msgstr "ник, используемый на IRC сервере"
 
+#, fuzzy
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr "ник, используемый на IRC сервере"
+
 #, fuzzy
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
@@ -11037,23 +11043,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
-
-#, fuzzy
-#~ msgid "commands defined by plugins"
-#~ msgstr "  (нет pluginа)\n"
-
-#, fuzzy
-#~ msgid "weechat commands"
-#~ msgstr "Внутренние команды %s:\n"
-
-#, fuzzy
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "  (нет pluginа)\n"
-
-#, fuzzy
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "цвет времени в окне чата"
-
-#, fuzzy
-#~ msgid "%s: removing old fifo pipe \"%s\""
-#~ msgstr "%s недостаточно памяти для сообщения в строке информации\n"
diff --git a/po/tr.po b/po/tr.po
index 43a5dbc7e..d68272cde 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
-"PO-Revision-Date: 2017-01-06 22:07+0100\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
+"PO-Revision-Date: 2017-06-23 11:58+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: tr\n"
@@ -4104,6 +4104,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -4231,6 +4233,9 @@ msgid ""
 "help buflist)"
 msgstr ""
 
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
@@ -10019,12 +10024,3 @@ msgstr ""
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
-
-#~ msgid "weechat commands"
-#~ msgstr "weechat komutları"
-
-#~ msgid "commands (weechat and plugins)"
-#~ msgstr "komutlar  (weechat ve eklentiler)"
-
-#~ msgid "text color for nicks in chat window"
-#~ msgstr "sohbet penceresindeki rumuzlar için metin rengi"
diff --git a/po/weechat.pot b/po/weechat.pot
index 4b52d59b5..5f5abd1fd 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-06-13 21:16+0200\n"
+"POT-Creation-Date: 2017-06-23 11:57+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4089,6 +4089,8 @@ msgid ""
 "the option buflist.look.nick_prefix is enabled)\n"
 "    - ${nick_prefix}: nick prefix for a channel (set only if the option "
 "buflist.look.nick_prefix is enabled)\n"
+"    - ${format_name}: formatted name (evaluation of option buflist.format."
+"name)\n"
 "    - ${name}: the short name (if set), with a fallback on the name\n"
 "    - ${color_hotlist}: the color depending on the highest hotlist level for "
 "the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the "
@@ -4216,6 +4218,9 @@ msgid ""
 "help buflist)"
 msgstr ""
 
+msgid "format for buffer name (note: content is evaluated, see /help buflist)"
+msgstr ""
+
 msgid ""
 "format for nick prefix on a channel (note: content is evaluated, see /help "
 "buflist)"
diff --git a/src/plugins/buflist/buflist-bar-item.c b/src/plugins/buflist/buflist-bar-item.c
index 0d3c3c45b..6abfb64ab 100644
--- a/src/plugins/buflist/buflist-bar-item.c
+++ b/src/plugins/buflist/buflist-bar-item.c
@@ -316,8 +316,10 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
         ptr_name = weechat_hdata_string (buflist_hdata_buffer,
                                          ptr_buffer, "short_name");
         if (!ptr_name)
+        {
             ptr_name = weechat_hdata_string (buflist_hdata_buffer,
                                              ptr_buffer, "name");
+        }
 
         if (*buflist[0])
         {
@@ -440,6 +442,10 @@ buflist_bar_item_buflist_cb (const void *pointer, void *data,
                                "indent", ptr_format_indent);
         weechat_hashtable_set (buflist_hashtable_extra_vars,
                                "name", ptr_name);
+        weechat_hashtable_set (buflist_hashtable_extra_vars,
+                               "format_name",
+                               weechat_config_string (
+                                   buflist_config_format_name));
 
         /* hotlist */
         ptr_hotlist_format = weechat_config_string (
diff --git a/src/plugins/buflist/buflist-command.c b/src/plugins/buflist/buflist-command.c
index 9ee8a59e3..13b779fdf 100644
--- a/src/plugins/buflist/buflist-command.c
+++ b/src/plugins/buflist/buflist-command.c
@@ -120,6 +120,8 @@ buflist_command_init ()
            "(set only if the option buflist.look.nick_prefix is enabled)\n"
            "    - ${nick_prefix}: nick prefix for a channel "
            "(set only if the option buflist.look.nick_prefix is enabled)\n"
+           "    - ${format_name}: formatted name (evaluation of option "
+           "buflist.format.name)\n"
            "    - ${name}: the short name (if set), with a fallback on the "
            "name\n"
            "    - ${color_hotlist}: the color depending on the highest "
diff --git a/src/plugins/buflist/buflist-config.c b/src/plugins/buflist/buflist-config.c
index 0c3df353d..9c08baa92 100644
--- a/src/plugins/buflist/buflist-config.c
+++ b/src/plugins/buflist/buflist-config.c
@@ -53,6 +53,7 @@ struct t_config_option *buflist_config_format_hotlist_level_none;
 struct t_config_option *buflist_config_format_hotlist_separator;
 struct t_config_option *buflist_config_format_indent;
 struct t_config_option *buflist_config_format_lag;
+struct t_config_option *buflist_config_format_name;
 struct t_config_option *buflist_config_format_nick_prefix;
 struct t_config_option *buflist_config_format_number;
 
@@ -463,7 +464,8 @@ buflist_config_init ()
         N_("format of each line with a buffer "
            "(note: content is evaluated, see /help buflist)"),
         NULL, 0, 0,
-        "${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}",
+        "${format_number}${indent}${format_nick_prefix}${color_hotlist}"
+        "${format_name}",
         NULL, 0,
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
@@ -562,6 +564,15 @@ buflist_config_init ()
         NULL, NULL, NULL,
         &buflist_config_change_buflist, NULL, NULL,
         NULL, NULL, NULL);
+    buflist_config_format_name = weechat_config_new_option (
+        buflist_config_file, ptr_section,
+        "name", "string",
+        N_("format for buffer name "
+           "(note: content is evaluated, see /help buflist)"),
+        NULL, 0, 0, "${name}", NULL, 0,
+        NULL, NULL, NULL,
+        &buflist_config_change_buflist, NULL, NULL,
+        NULL, NULL, NULL);
     buflist_config_format_nick_prefix = weechat_config_new_option (
         buflist_config_file, ptr_section,
         "nick_prefix", "string",
diff --git a/src/plugins/buflist/buflist-config.h b/src/plugins/buflist/buflist-config.h
index 263dff9f2..1e4d9b877 100644
--- a/src/plugins/buflist/buflist-config.h
+++ b/src/plugins/buflist/buflist-config.h
@@ -51,6 +51,7 @@ extern struct t_config_option *buflist_config_format_hotlist_level_none;
 extern struct t_config_option *buflist_config_format_hotlist_separator;
 extern struct t_config_option *buflist_config_format_indent;
 extern struct t_config_option *buflist_config_format_lag;
+extern struct t_config_option *buflist_config_format_name;
 extern struct t_config_option *buflist_config_format_nick_prefix;
 extern struct t_config_option *buflist_config_format_number;