diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 3bd7f7489..e8f3cc474 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -27,6 +27,7 @@ New features::
   * buflist: new plugin "buflist" (bar item with list of buffers)
   * api: add arraylist functions: arraylist_new(), arraylist_size(), arraylist_get(), arraylist_search(), arraylist_insert(), arraylist_add(), arraylist_remove(), arraylist_clear(), arraylist_free()
   * api: add dynamic string functions: string_dyn_alloc(), string_dyn_copy(), string_dyn_concat(), string_dyn_free()
+  * irc: add option "open" in command /server (issue #966)
   * irc: send signal "irc_server_lag_changed" and store the lag in the server buffer (local variable)
 
 Improvements::
diff --git a/doc/de/autogen/user/irc_commands.adoc b/doc/de/autogen/user/irc_commands.adoc
index 285739f16..f420e3cf3 100644
--- a/doc/de/autogen/user/irc_commands.adoc
+++ b/doc/de/autogen/user/irc_commands.adoc
@@ -723,27 +723,29 @@ reason: Grund der Abmeldung
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
          reorder <server> [<server>...]
+         open <server>|-all [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
-    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-listfull: listet alle Server auf, mit detaillierten Informationen zu jedem einzelnen Server
-     add: erstellt einen neuen Server
-  server: Servername, dient der internen Nutzung und zur Darstellung
-hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Verschiedene Ports können durch Kommata getrennt werden
-   -temp: erstellt temporären Server (wird nicht gespeichert)
-  option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
-nooption: stellt die Boolean Einstellung auf 'off' (Beispiel: -nossl)
-    copy: erstellt eine Kopie des Servers
-  rename: benennt den Server um
- reorder: Anordnung der Server ändern
-    keep: übernimmt den Server in die Konfigurationsdatei (nur sinnvoll bei temporär angelegten Servern)
-     del: entfernt einen Server
- deloutq: löscht bei allen Servern alle ausgehende Nachrichten, die in der Warteschlange stehen (dies betrifft alle Nachrichten die WeeChat gerade sendet)
-    jump: springt zum Server-Buffer
-     raw: öffnet Buffer mit Roh-IRC-Daten
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: add a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    open: open the server buffer without connecting
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-Beispiele:
+Examples:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/doc/en/autogen/user/irc_commands.adoc b/doc/en/autogen/user/irc_commands.adoc
index 1e24d62c9..72b319fd4 100644
--- a/doc/en/autogen/user/irc_commands.adoc
+++ b/doc/en/autogen/user/irc_commands.adoc
@@ -723,6 +723,7 @@ reason: reason
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
          reorder <server> [<server>...]
+         open <server>|-all [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
@@ -737,6 +738,7 @@ nooption: set boolean option to 'off' (for example: -nossl)
     copy: duplicate a server
   rename: rename a server
  reorder: reorder list of servers
+    open: open the server buffer without connecting
     keep: keep server in config file (for temporary servers only)
      del: delete a server
  deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
diff --git a/doc/fr/autogen/user/irc_commands.adoc b/doc/fr/autogen/user/irc_commands.adoc
index 03aaa6828..b7f5d0c68 100644
--- a/doc/fr/autogen/user/irc_commands.adoc
+++ b/doc/fr/autogen/user/irc_commands.adoc
@@ -723,6 +723,7 @@ raison : raison
          add <serveur> <nom>[/<port>] [-temp] [-<option>[=<valeur>]] [-no<option>]
          copy|rename <serveur> <nouveau_nom>
          reorder <serveur> [<serveur>...]
+         open <serveur>|-all [<serveur>...]
          del|keep <serveur>
          deloutq|jump|raw
 
@@ -737,6 +738,7 @@ nooption : définir l'option booléenne à 'off' (par exemple : -nossl)
     copy : dupliquer un serveur
   rename : renommer un serveur
  reorder : réordonner la liste des serveurs
+    open : ouvrir le tampon du serveur sans s'y connecter
     keep : garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)
      del : supprimer un serveur
  deloutq : supprimer la file d'attente des messages sortants pour tous les serveurs (tous les messages que WeeChat est actuellement en train d'envoyer)
diff --git a/doc/it/autogen/user/irc_commands.adoc b/doc/it/autogen/user/irc_commands.adoc
index 6c4046de5..49bfb1a94 100644
--- a/doc/it/autogen/user/irc_commands.adoc
+++ b/doc/it/autogen/user/irc_commands.adoc
@@ -723,6 +723,7 @@ motivo: motivo
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
          reorder <server> [<server>...]
+         open <server>|-all [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
@@ -737,6 +738,7 @@ nooption: set boolean option to 'off' (for example: -nossl)
     copy: duplicate a server
   rename: rename a server
  reorder: reorder list of servers
+    open: open the server buffer without connecting
     keep: keep server in config file (for temporary servers only)
      del: delete a server
  deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
diff --git a/doc/ja/autogen/user/irc_commands.adoc b/doc/ja/autogen/user/irc_commands.adoc
index c7a7ec142..528b6be5c 100644
--- a/doc/ja/autogen/user/irc_commands.adoc
+++ b/doc/ja/autogen/user/irc_commands.adoc
@@ -723,27 +723,29 @@ reason: 理由
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
          reorder <server> [<server>...]
+         open <server>|-all [<server>...]
          del|keep <server>
          deloutq|jump|raw
 
-    list: サーバをリストアップ (引数無しでは、リストが表示される)
-listfull: 詳細情報を含めてサーバをリストアップ
-     add: 新しいサーバを追加
-  server: サーバ名、内部的な利用と表示に利用
-hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切る
-   -temp: 一時的なサーバを追加 (保存されない)
-  option: サーバのオプションを設定 (ブールオプションでは値が無視される)
-nooption: ブールオプションを 'off' に設定 (例: -nossl)
-    copy: サーバを複製
-  rename: サーバをリネーム
- reorder: サーバリストにおける順番を入れ替える
-    keep: 設定ファイルにサーバを保存 (一時的なサーバ用)
-     del: サーバを削除
- deloutq: 全てのサーバにメッセージの削除を要求 (WeeChat が送信している全てのメッセージ)
-    jump: サーババッファに移動
-     raw: 生 IRC データを表示するバッファを開く
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: add a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    open: open the server buffer without connecting
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-例:
+Examples:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/doc/pl/autogen/user/irc_commands.adoc b/doc/pl/autogen/user/irc_commands.adoc
index a69413ce9..6526a056b 100644
--- a/doc/pl/autogen/user/irc_commands.adoc
+++ b/doc/pl/autogen/user/irc_commands.adoc
@@ -719,30 +719,33 @@ powód: powód
 * `+server+`: wyświetla, dodaje lub usuwa serwery IRC
 
 ----
-/server  list|listfull [<serwer>]
-         add <serwera> <host>[/<port>] [-temp] [-<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa>
-         reorder <serwer> [<serwer>...]
-         del|keep <serwer>]
+/server  list|listfull [<server>]
+         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <server> <new_name>
+         reorder <server> [<server>...]
+         open <server>|-all [<server>...]
+         del|keep <server>
          deloutq|jump|raw
 
-    list: wyświetla listę serwerów (bez argumentu wyświetlana jest ta lista)
-listfull: wyświetla listę serwerów ze szczegółowymi informacjami dla każdego serwera
-     add: tworzy nowy serwer
-  serwer: nazwa serwera, do użytku wewnętrznego i  wyświetlania
-host: nazwa albo adres IP serwera, z opcjonalnym numerem portu (domyślnie: 6667), wiele adresów należy rozdzielić przecinkiem
-   -temp: tworzy serwer tymczasowy (nie zapisany)
-  opcja: ustawia opcję dla serwera (dla opcji boolowskich wartość może zostać pominięta)
-noopcja: ustawia opcje boolowskie na 'off' (na przykład: -nossl)
-    copy: duplikuje serwer
-  rename: zmienia nazwę serwera
- reorder: zmienia kolejność na liście serwerów
-    keep: zachowuje serwer w pliku konfiguracyjnym (tylko dla serwerów tymczasowych)
-     del: usuwa serwer
- deloutq: usuń wiadomości z kolejki dla wszystkich serwerów (wszystkie wiadomości jakie WeeChat obecnie wysyła)
-    jump: przechodzi do bufora serwera
-     raw: otwiera bufor z nieprzetworzonymi danymi IRC
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: add a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    open: open the server buffer without connecting
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
 
-Przykłady:
+Examples:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
diff --git a/po/cs.po b/po/cs.po
index 5dda4d226..a0defe19c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 21:59+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6802,7 +6802,8 @@ msgstr "vypíše, přídá nebo odebere IRC servery"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|"
@@ -6822,6 +6823,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/de.po b/po/de.po
index 3fbdf52ff..d1f46f814 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-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-04-26 22:41+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -7998,15 +7998,18 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "auflisten, hinzufügen oder entfernen von IRC-Servern"
 
+#, fuzzy
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -8020,6 +8023,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/es.po b/po/es.po
index 9c757d22d..789b8d56b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 22:01+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7041,7 +7041,8 @@ msgstr "lista, añade o elimina servidores IRC"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<puerto>] [-temp] [-"
 "<opción>[=<valor>]] [-no<opción>] || copy|rename <servidor> <nuevo_nombre> "
@@ -7061,6 +7062,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/fr.po b/po/fr.po
index 4595bfe03..a30bb6f23 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-04-29 17:38+0200\n"
-"PO-Revision-Date: 2017-04-29 17:39+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
+"PO-Revision-Date: 2017-05-02 07:34+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -7842,11 +7842,13 @@ msgstr "lister, ajouter ou retirer des serveurs IRC"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<serveur>] || add <serveur> <nom>[/<port>] [-temp] [-"
 "<option>[=<valeur>]] [-no<option>] || copy|rename <serveur> <nouveau_nom> || "
-"reorder <serveur> [<serveur>...] || del|keep <serveur> || deloutq|jump|raw"
+"reorder <serveur> [<serveur>...] || open <serveur>|-all [<serveur>...] || "
+"del|keep <serveur> || deloutq|jump|raw"
 
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
@@ -7861,6 +7863,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
@@ -7892,6 +7895,7 @@ msgstr ""
 "    copy : dupliquer un serveur\n"
 "  rename : renommer un serveur\n"
 " reorder : réordonner la liste des serveurs\n"
+"    open : ouvrir le tampon du serveur sans s'y connecter\n"
 "    keep : garder le serveur dans le fichier de configuration (pour les "
 "serveurs temporaires seulement)\n"
 "     del : supprimer un serveur\n"
diff --git a/po/hu.po b/po/hu.po
index f780200be..3f6ce73f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 22:03+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6234,7 +6234,8 @@ msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
 "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -6256,6 +6257,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/it.po b/po/it.po
index 1ae93b010..dc68b9540 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 22:04+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7211,7 +7211,8 @@ msgstr "elenca, aggiunge o rimuove server IRC"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <host>[/<porta>] [-temp] [-"
 "<opzione>[=<valore>]] [-no<option>] || copy|rename <server> <nuovo_nome> || "
@@ -7231,6 +7232,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/ja.po b/po/ja.po
index b64efc7ea..cad40364f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-04-23 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -7509,15 +7509,18 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "IRC サーバのリストアップ、追加、削除"
 
+#, fuzzy
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -7531,6 +7534,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/pl.po b/po/pl.po
index 91efc620f..d712c0fd6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-04-08 14:49+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7579,15 +7579,18 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "wyświetla, dodaje lub usuwa serwery IRC"
 
+#, fuzzy
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<serwer>] || add <serwera> <host>[/<port>] [-temp] [-"
 "<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa> || "
 "reorder <serwer> [<serwer>...] || del|keep <serwer>] || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -7601,6 +7604,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/pt.po b/po/pt.po
index 0d7ec3cbc..12529f0f6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-04-08 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -7575,15 +7575,18 @@ msgstr ""
 msgid "list, add or remove IRC servers"
 msgstr "listar, adicionar ou remover servidores IRC"
 
+#, fuzzy
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<servidor>] || add <servidor> <hostname>[/<porta>] [-temp] [-"
 "<opção>[=<valor>]] [-no<opção>] || copy|rename <servidor> <novo_nome> || "
 "reorder <servidor> [<servidor>...] || del|keep <servidor> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -7597,6 +7600,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 025895c41..c695bf0db 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2016-09-03 08:24+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6740,7 +6740,8 @@ msgstr ""
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 
 msgid ""
@@ -6756,6 +6757,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/ru.po b/po/ru.po
index 10249a050..f8ec8e04b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 22:06+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6271,7 +6271,8 @@ msgstr "перечислить, добавить или удалить серв
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
 "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -6293,6 +6294,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/tr.po b/po/tr.po
index be350093d..5248d5671 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2017-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+0200\n"
 "PO-Revision-Date: 2017-01-06 22:07+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5644,7 +5644,8 @@ msgstr "İRC sunucularını listele, ekle veya kaldır"
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 "list|listfull [<sunucu>] || add <sunucu> <hostname>[/<port>] [-temp] [-"
 "<seçenek>[=<değer>]] [-no<seçenek>] || copy|rename <sunucu> <yeni_isim> || "
@@ -5664,6 +5665,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/po/weechat.pot b/po/weechat.pot
index d46251c81..39608f419 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-04-29 17:38+0200\n"
+"POT-Creation-Date: 2017-05-02 07:33+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"
@@ -5609,7 +5609,8 @@ msgstr ""
 msgid ""
 "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-"
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
-"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
+"reorder <server> [<server>...] || open <server>|-all [<server>...] || del|"
+"keep <server> || deloutq|jump|raw"
 msgstr ""
 
 msgid ""
@@ -5625,6 +5626,7 @@ msgid ""
 "    copy: duplicate a server\n"
 "  rename: rename a server\n"
 " reorder: reorder list of servers\n"
+"    open: open the server buffer without connecting\n"
 "    keep: keep server in config file (for temporary servers only)\n"
 "     del: delete a server\n"
 " deloutq: delete messages out queue for all servers (all messages WeeChat is "
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 700c23406..3741687b2 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -5086,6 +5086,7 @@ IRC_COMMAND_CALLBACK(server)
     if (weechat_strcasecmp (argv[1], "add") == 0)
     {
         WEECHAT_COMMAND_MIN_ARGS(4, "add");
+
         ptr_server2 = irc_server_casesearch (argv[2]);
         if (ptr_server2)
         {
@@ -5237,6 +5238,55 @@ IRC_COMMAND_CALLBACK(server)
         return WEECHAT_RC_OK;
     }
 
+    if (weechat_strcasecmp (argv[1], "open") == 0)
+    {
+        WEECHAT_COMMAND_MIN_ARGS(3, "open");
+
+        if (weechat_strcasecmp (argv[2], "-all") == 0)
+        {
+            for (ptr_server2 = irc_servers; ptr_server2;
+                 ptr_server2 = ptr_server2->next_server)
+            {
+                if (!ptr_server2->buffer)
+                {
+                    if (irc_server_create_buffer (ptr_server2))
+                    {
+                        weechat_buffer_set (ptr_server2->buffer,
+                                            "display", "auto");
+                    }
+                }
+            }
+        }
+        else
+        {
+            for (i = 2; i < argc; i++)
+            {
+                ptr_server2 = irc_server_search (argv[i]);
+                if (ptr_server2)
+                {
+                    if (!ptr_server2->buffer)
+                    {
+                        if (irc_server_create_buffer (ptr_server2))
+                        {
+                            weechat_buffer_set (ptr_server2->buffer,
+                                                "display", "auto");
+                        }
+                    }
+                }
+                else
+                {
+                    weechat_printf (
+                        NULL,
+                        _("%s%s: server \"%s\" not found for \"%s\" command"),
+                        weechat_prefix ("error"), IRC_PLUGIN_NAME,
+                        argv[i], "server open");
+                }
+            }
+        }
+
+        return WEECHAT_RC_OK;
+    }
+
     if (weechat_strcasecmp (argv[1], "keep") == 0)
     {
         WEECHAT_COMMAND_MIN_ARGS(3, "keep");
@@ -6786,6 +6836,7 @@ irc_command_init ()
            "[-no<option>]"
            " || copy|rename <server> <new_name>"
            " || reorder <server> [<server>...]"
+           " || open <server>|-all [<server>...]"
            " || del|keep <server>"
            " || deloutq|jump|raw"),
         N_("    list: list servers (without argument, this list is displayed)\n"
@@ -6801,6 +6852,7 @@ irc_command_init ()
            "    copy: duplicate a server\n"
            "  rename: rename a server\n"
            " reorder: reorder list of servers\n"
+           "    open: open the server buffer without connecting\n"
            "    keep: keep server in config file (for temporary servers only)\n"
            "     del: delete a server\n"
            " deloutq: delete messages out queue for all servers (all messages "
@@ -6826,6 +6878,7 @@ irc_command_init ()
         " || rename %(irc_servers) %(irc_servers)"
         " || keep %(irc_servers)"
         " || reorder %(irc_servers)|%*"
+        " || open %(irc_servers)|-all %(irc_servers)|%*"
         " || del %(irc_servers)"
         " || deloutq"
         " || jump"