diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 663682a0d..c6ba0063f 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 New features::
 
+  * core: add option "cycle" in command /buffer
   * relay: add option relay.network.allow_empty_password (issue #735)
   * trigger: add support for one-time triggers (issue #399, issue #509)
 
diff --git a/po/cs.po b/po/cs.po
index a9d197719..3596605a5 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1153,12 +1153,12 @@ msgstr "řídit buffery"
 #, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge "
 "[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set "
@@ -1173,6 +1173,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1210,6 +1211,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/de.po b/po/de.po
index edde5dcc4..51093eb35 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-08-11 09:09+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -1179,14 +1179,15 @@ msgstr ""
 msgid "manage buffers"
 msgstr "Buffer verwalten"
 
+#, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
 "<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
@@ -1196,6 +1197,7 @@ msgstr ""
 "notify <level> || localvar || set <property> <value> || get <property> || "
 "<number>|-|+|<name>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
@@ -1204,6 +1206,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1241,6 +1244,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/es.po b/po/es.po
index 4cb020eab..787fac4da 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:42+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1150,12 +1150,12 @@ msgstr "gestionar los buffers"
 #, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nombre>|-merged|-all] || move|merge <número> ||  "
 "swap<número1>|<nombre1> [<número2>|<nombre2>] || unmerge [<número>|-all] || "
@@ -1171,6 +1171,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1208,6 +1209,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/fr.po b/po/fr.po
index fcb25961b..6a8cb198c 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: 2016-08-10 22:30+0200\n"
-"PO-Revision-Date: 2016-08-10 22:31+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
+"PO-Revision-Date: 2016-08-14 10:12+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1158,19 +1158,20 @@ msgstr "gestion des tampons"
 
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<nombre>|<nom>|-merged|-all [<nombre>|<nom>...]] || move "
-"<nombre>|-|+ || swap <nombre1>|<nom1> [<nombre2>|<nom2>] || merge <nombre> "
-"|| unmerge [<nombre>|-all] || hide [<nombre>|<nom>|-all [<nombre>|<nom>...]] "
-"|| unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || renumber <nombre1> "
-"[<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>] || notify <niveau> || "
-"localvar || set <propriété> <valeur> || get <propriété> || <nombre>|<nom>"
+"<nombre>|-|+ || swap <nombre1>|<nom1> [<nombre2>|<nom2>] || cycle <nombre>|"
+"<nom> [<nombre>|<nom>...] || merge <nombre> || unmerge [<nombre>|-all] || "
+"hide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || unhide [<nombre>|<nom>|-"
+"all [<nombre>|<nom>...]] || renumber <nombre1> [<nombre2> [<départ>]] || "
+"close [<n1>[-<n2>]|<nom>] || notify <niveau> || localvar || set <propriété> "
+"<valeur> || get <propriété> || <nombre>|<nom>"
 
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
@@ -1180,6 +1181,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1217,6 +1219,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
@@ -1242,6 +1246,7 @@ msgstr ""
 "vers le dernier numéro de tampon + 1\n"
 "    swap : échanger deux tampons (échanger avec le tampon courant si un seul "
 "numéro/nom donné)\n"
+"   cycle : sauter en boucle entre une liste de plusieurs tampons\n"
 "   merge : mélanger le tampon courant avec un autre tampon (la zone de "
 "discussion sera un mélange des deux tampons)\n"
 "           (par défaut ctrl-x bascule entre les tampons mélangés)\n"
@@ -1280,6 +1285,8 @@ msgstr ""
 "    /buffer swap 1 3\n"
 "  échanger le tampon #weechat avec le tampon courant :\n"
 "    /buffer swap #weechat\n"
+"  sauter sur #canal1, #canal2, #canal3 en boucle :\n"
+"    /buffer cycle #canal1 #canal2 #canal3\n"
 "  mélanger avec le tampon core :\n"
 "    /buffer merge 1\n"
 "  détacher le tampon :\n"
diff --git a/po/hu.po b/po/hu.po
index 59dda64c8..2697ee802 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1124,12 +1124,12 @@ msgstr "pufferek kezelése"
 
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 
 #, fuzzy
@@ -1141,6 +1141,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1178,6 +1179,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/it.po b/po/it.po
index e2a73487a..290bdfcec 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1128,12 +1128,12 @@ msgstr "gestione dei buffer"
 #, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || swap "
 "<numero1>|<nome1> [<numero2>|<nome2>] || unmerge [<numero>|-all] || close "
@@ -1149,6 +1149,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1186,6 +1187,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/ja.po b/po/ja.po
index 6ecdf1645..3bc7e8ecd 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-08-07 16:37+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -1134,14 +1134,15 @@ msgstr ""
 msgid "manage buffers"
 msgstr "バッファの管理"
 
+#, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
 "<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
@@ -1150,6 +1151,7 @@ msgstr ""
 "[<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify <level> || "
 "localvar || set <property> <value> || get <property> || <number>|-|+|<name>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
@@ -1158,6 +1160,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1195,6 +1198,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/pl.po b/po/pl.po
index 892ca73e8..03bf2add8 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1164,14 +1164,15 @@ msgstr ""
 msgid "manage buffers"
 msgstr "zarządzaj buforami"
 
+#, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<numer>|<nazwa>|-merged|-all [<number>|<nazwa>...]] || move "
 "<numer>|-|+ || swap <numer1>|<nazwa1> [<numer2>|<nazwa2>] || merge <numer> "
@@ -1181,6 +1182,7 @@ msgstr ""
 "notify <poxiom> || localvar || set <właściwość> <wartość> || get "
 "<właściwość> || <numer>|-|+|<nazwa>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
@@ -1189,6 +1191,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1226,6 +1229,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/pt.po b/po/pt.po
index 5b626bc7b..e5add0441 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -1152,14 +1152,15 @@ msgstr ""
 msgid "manage buffers"
 msgstr "gerir buffers"
 
+#, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all [<número>|<nome>...]] || move "
 "<número>|-|+ || swap <número1>|<nome1> [<número2>|<nome2>] || merge <número> "
@@ -1169,6 +1170,7 @@ msgstr ""
 "notify <nível> || localvar || set <propriedade> <valor> || get <propriedade> "
 "|| <número>|-|+|<nome>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
@@ -1177,6 +1179,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1214,6 +1217,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c3a97a12d..3218061f7 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1171,12 +1171,12 @@ msgstr "gerenciar buffers"
 #, fuzzy
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap "
 "<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close "
@@ -1193,6 +1193,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1230,6 +1231,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/ru.po b/po/ru.po
index b66c0700a..d30c6c86d 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1145,12 +1145,12 @@ msgstr "управление буферами"
 
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 
 #, fuzzy
@@ -1162,6 +1162,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1199,6 +1200,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/tr.po b/po/tr.po
index cbbb2bb74..f04495d10 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+0200\n"
 "PO-Revision-Date: 2016-05-18 07:43+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1018,12 +1018,12 @@ msgstr ""
 
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 
 msgid ""
@@ -1034,6 +1034,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1071,6 +1072,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 6396a0846..b75f7372c 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: 2016-08-10 22:30+0200\n"
+"POT-Creation-Date: 2016-08-14 10:08+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"
@@ -1021,12 +1021,12 @@ msgstr ""
 
 msgid ""
 "list || clear [<number>|<name>|-merged|-all [<number>|<name>...]] || move "
-"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || merge <number> "
-"|| unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> <value> || get <property> || "
-"<number>|-|+|<name>"
+"<number>|-|+ || swap <number1>|<name1> [<number2>|<name2>] || cycle <number>|"
+"<name> [<number>|<name>...]] || merge <number> || unmerge [<number>|-all] || "
+"hide [<number>|<name>|-all [<number>|<name>...]] || unhide [<number>|<name>|-"
+"all [<number>|<name>...]] || renumber [<number1> [<number2> [<start>]]] || "
+"close [<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> "
+"<value> || get <property> || <number>|-|+|<name>"
 msgstr ""
 
 msgid ""
@@ -1037,6 +1037,7 @@ msgid ""
 "move to first buffer number, \"+\" = move to last buffer number + 1\n"
 "    swap: swap two buffers (swap with current buffer if only one number/name "
 "given)\n"
+"   cycle: jump loop between a list of buffers\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1074,6 +1075,8 @@ msgid ""
 "    /buffer swap 1 3\n"
 "  swap buffer #weechat with current buffer:\n"
 "    /buffer swap #weechat\n"
+"  jump on #chan1, #chan2, #chan3 and loop:\n"
+"    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index d0bd4d982..daef2d239 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -542,11 +542,12 @@ command_buffer_display_localvar (void *data,
 
 COMMAND_CALLBACK(buffer)
 {
-    struct t_gui_buffer *ptr_buffer, *ptr_buffer2, *ptr_prev_buffer;
-    struct t_gui_buffer *weechat_buffer;
+    struct t_gui_buffer *ptr_buffer, *ptr_buffer1, *ptr_buffer2;
+    struct t_gui_buffer *ptr_prev_buffer, *weechat_buffer;
     long number, number1, number2, numbers[3];
     char *error, *value, *pos, *str_number1, *pos_number2;
     int i, error_main_buffer, num_buffers, count, prev_number, clear_number;
+    int buffer_found;
 
     /* make C compiler happy */
     (void) pointer;
@@ -707,6 +708,54 @@ COMMAND_CALLBACK(buffer)
         return WEECHAT_RC_OK;
     }
 
+    /* cycle between a list of buffers */
+    if (string_strcasecmp (argv[1], "cycle") == 0)
+    {
+        COMMAND_MIN_ARGS(3, "cycle");
+
+        /* first buffer found different from current one */
+        ptr_buffer1 = NULL;
+
+        /* boolean to check if current buffer was found in list */
+        buffer_found = 0;
+
+        for (i = 2; i < argc; i++)
+        {
+            ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+            if (!ptr_buffer)
+                continue;
+            if (ptr_buffer == buffer)
+            {
+                /* current buffer found */
+                buffer_found = 1;
+            }
+            else
+            {
+                if (!ptr_buffer1)
+                    ptr_buffer1 = ptr_buffer;
+                if (buffer_found)
+                {
+                    /*
+                     * we already found the current buffer in list,
+                     * so let's jump to this buffer
+                     */
+                    gui_window_switch_to_buffer (gui_current_window,
+                                                 ptr_buffer, 1);
+                    return WEECHAT_RC_OK;
+                }
+            }
+        }
+
+        /* cycle on the first buffer found if no other buffer was found */
+        if (ptr_buffer1)
+        {
+            gui_window_switch_to_buffer (gui_current_window,
+                                         ptr_buffer1, 1);
+        }
+
+        return WEECHAT_RC_OK;
+    }
+
     /* merge buffer with another number in the list */
     if (string_strcasecmp (argv[1], "merge") == 0)
     {
@@ -6883,6 +6932,7 @@ command_init ()
            " || clear [<number>|<name>|-merged|-all [<number>|<name>...]]"
            " || move <number>|-|+"
            " || swap <number1>|<name1> [<number2>|<name2>]"
+           " || cycle <number>|<name> [<number>|<name>...]]"
            " || merge <number>"
            " || unmerge [<number>|-all]"
            " || hide [<number>|<name>|-all [<number>|<name>...]]"
@@ -6902,6 +6952,7 @@ command_init ()
            "number + 1\n"
            "    swap: swap two buffers (swap with current buffer if only one "
            "number/name given)\n"
+           "   cycle: jump loop between a list of buffers\n"
            "   merge: merge current buffer to another buffer (chat area will "
            "be mix of both buffers)\n"
            "          (by default ctrl-x switches between merged buffers)\n"
@@ -6939,6 +6990,8 @@ command_init ()
            "    /buffer swap 1 3\n"
            "  swap buffer #weechat with current buffer:\n"
            "    /buffer swap #weechat\n"
+           "  jump on #chan1, #chan2, #chan3 and loop:\n"
+           "    /buffer cycle #chan1 #chan2 #chan3\n"
            "  merge with core buffer:\n"
            "    /buffer merge 1\n"
            "  unmerge buffer:\n"
@@ -6957,6 +7010,7 @@ command_init ()
         "%(buffers_numbers)|%(buffers_plugins_names)|%*"
         " || move %(buffers_numbers)"
         " || swap %(buffers_numbers)"
+        " || cycle %(buffers_numbers)|%(buffers_plugins_names)|%*"
         " || merge %(buffers_numbers)"
         " || unmerge %(buffers_numbers)|-all"
         " || hide %(buffers_numbers)|%(buffers_plugins_names)|-all "