diff --git a/doc/weechat_doc_en.texi b/doc/weechat_doc_en.texi
index cdac11662..b745f9d9d 100644
--- a/doc/weechat_doc_en.texi
+++ b/doc/weechat_doc_en.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.0 - February, 12 2005
+@subtitle Documentation for WeeChat v0.1.1-cvs - February, 22 2005
 
 @image{weechat_image}
 
@@ -641,11 +641,11 @@ Call again last commands/messages@*
 @item PageUp / PageDown
 Show buffer history@*
 @*
-@item F6 / F7
+@item F5 / F6
 Switch to previous / next buffer@*
 @*
-@item F8
-Switch to next window@*
+@item F7 / F8
+Switch to previous / next window@*
 @*
 @item F10
 Remove last infobar message@*
@@ -654,7 +654,7 @@ Remove last infobar message@*
 Redraw whole window@*
 @*
 @item Alt + left arrow / Alt + right arrow
-Same as F6 / F7@*
+Same as F5 / F6@*
 @*
 @item Alt + A
 Switch to next buffer with activity (with priority: highlight, message, other)@*
diff --git a/doc/weechat_doc_fr.texi b/doc/weechat_doc_fr.texi
index fef9bb2a4..c028dc4bb 100644
--- a/doc/weechat_doc_fr.texi
+++ b/doc/weechat_doc_fr.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.0 - 12 F@'evrier 2005
+@subtitle Documentation pour WeeChat v0.1.1-cvs - 22 F@'evrier 2005
 
 @image{weechat_image}
 
@@ -641,11 +641,11 @@ Rappeler les derni@`eres commandes/messages@*
 @item PageUp / PageDown
 Afficher l'historique du tampon@*
 @*
-@item F6 / F7
-Aller au tampon pr@'ec@'edent@*
+@item F5 / F6
+Aller au tampon pr@'ec@'edent / suivant@*
 @*
-@item F8
-Aller @`a la fen@^etre suivante@*
+@item F7 / F8
+Aller @`a la fen@^etre pr@'ec@'edente / suivante@*
 @*
 @item F10
 Effacer le dernier message de la barre d'infos@*
@@ -654,7 +654,7 @@ Effacer le dernier message de la barre d'infos@*
 R@'eaffiche toute la fen@^etre@*
 @*
 @item Alt + fl@`eche gauche / Alt + fl@`eche droite
-Identique @`a F6 / F7@*
+Identique @`a F5 / F6@*
 @*
 @item Alt + A
 Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@*
diff --git a/doc/weechat_doc_pt.texi b/doc/weechat_doc_pt.texi
index 21b465924..368d39636 100644
--- a/doc/weechat_doc_pt.texi
+++ b/doc/weechat_doc_pt.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.0 - 12 de Fevereiro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.1-cvs - 22 de Fevereiro de 2005
 
 @image{weechat_image}
 
@@ -274,11 +274,11 @@ Repetir os ultimos comandos/mensagens@*
 @item PageUp / PageDown
 Navegar no hist@'orico da janela@*
 @*
-@item F6 / F7
-Ir para a janela anterior/seguinte@*
+@item F5 / F6
+Comute ao amortecedor anterior / seguinte@*
 @*
-@item F8
-Comute @`a janela seguinte@*
+@item F7 / F8
+Comute ao janela anterior / seguinte@*
 @*
 @item F10
 Apagar a @'ultima mensagem da barra do info@*
@@ -287,7 +287,7 @@ Apagar a @'ultima mensagem da barra do info@*
 Redesenhe a janela inteira@*
 @*
 @item Alt + Seta da esquerda / Alt + Seta da direita
-Identico a F6 / F7@*
+Identico a F5 / F6@*
 @*
 @item Alt + A
 Comute ao amortecedor seguinte com atividade (com prioridade:  destaque, mensagem, outra)@*
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index 714becff1..bb9c674c9 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -1571,6 +1571,25 @@ gui_switch_to_next_buffer (t_gui_window *window)
     gui_redraw_buffer (window->buffer);
 }
 
+/*
+ * gui_switch_to_previous_window: switch to previous window
+ */
+
+void
+gui_switch_to_previous_window (t_gui_window *window)
+{
+    if (!gui_ok)
+        return;
+    
+    /* if only one window then return */
+    if (gui_windows == last_gui_window)
+        return;
+    
+    gui_current_window = (window->prev_window) ? window->prev_window : last_gui_window;
+    gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
+    gui_redraw_buffer (gui_current_window->buffer);
+}
+
 /*
  * gui_switch_to_next_window: switch to next window
  */
diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c
index 472103e90..ca29e837b 100644
--- a/src/gui/curses/gui-input.c
+++ b/src/gui/curses/gui-input.c
@@ -70,19 +70,22 @@ gui_read_keyb ()
             case KEY_F(2):
             case KEY_F(3):
             case KEY_F(4):
-            case KEY_F(5):
             case KEY_F(9):
             case KEY_F(11):
             case KEY_F(12):
                 break;
             /* previous buffer in window */
-            case KEY_F(6):
+            case KEY_F(5):
                 gui_switch_to_previous_buffer (gui_current_window);
                 break;
             /* next buffer in window */
-            case KEY_F(7):
+            case KEY_F(6):
                 gui_switch_to_next_buffer (gui_current_window);
                 break;
+            /* previous window */
+            case KEY_F(7):
+                gui_switch_to_previous_window (gui_current_window);
+                break;
             /* next window */
             case KEY_F(8):
                 gui_switch_to_next_window (gui_current_window);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 2268278aa..06edb434b 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -293,6 +293,7 @@ extern t_gui_buffer *gui_get_dcc_buffer ();
 extern void gui_switch_to_dcc_buffer ();
 extern void gui_switch_to_previous_buffer (t_gui_window *);
 extern void gui_switch_to_next_buffer (t_gui_window *);
+extern void gui_switch_to_previous_window (t_gui_window *);
 extern void gui_switch_to_next_window (t_gui_window *);
 extern void gui_move_page_up ();
 extern void gui_move_page_down ();
diff --git a/weechat/doc/weechat_doc_en.texi b/weechat/doc/weechat_doc_en.texi
index cdac11662..b745f9d9d 100644
--- a/weechat/doc/weechat_doc_en.texi
+++ b/weechat/doc/weechat_doc_en.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.0 - February, 12 2005
+@subtitle Documentation for WeeChat v0.1.1-cvs - February, 22 2005
 
 @image{weechat_image}
 
@@ -641,11 +641,11 @@ Call again last commands/messages@*
 @item PageUp / PageDown
 Show buffer history@*
 @*
-@item F6 / F7
+@item F5 / F6
 Switch to previous / next buffer@*
 @*
-@item F8
-Switch to next window@*
+@item F7 / F8
+Switch to previous / next window@*
 @*
 @item F10
 Remove last infobar message@*
@@ -654,7 +654,7 @@ Remove last infobar message@*
 Redraw whole window@*
 @*
 @item Alt + left arrow / Alt + right arrow
-Same as F6 / F7@*
+Same as F5 / F6@*
 @*
 @item Alt + A
 Switch to next buffer with activity (with priority: highlight, message, other)@*
diff --git a/weechat/doc/weechat_doc_fr.texi b/weechat/doc/weechat_doc_fr.texi
index fef9bb2a4..c028dc4bb 100644
--- a/weechat/doc/weechat_doc_fr.texi
+++ b/weechat/doc/weechat_doc_fr.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.0 - 12 F@'evrier 2005
+@subtitle Documentation pour WeeChat v0.1.1-cvs - 22 F@'evrier 2005
 
 @image{weechat_image}
 
@@ -641,11 +641,11 @@ Rappeler les derni@`eres commandes/messages@*
 @item PageUp / PageDown
 Afficher l'historique du tampon@*
 @*
-@item F6 / F7
-Aller au tampon pr@'ec@'edent@*
+@item F5 / F6
+Aller au tampon pr@'ec@'edent / suivant@*
 @*
-@item F8
-Aller @`a la fen@^etre suivante@*
+@item F7 / F8
+Aller @`a la fen@^etre pr@'ec@'edente / suivante@*
 @*
 @item F10
 Effacer le dernier message de la barre d'infos@*
@@ -654,7 +654,7 @@ Effacer le dernier message de la barre d'infos@*
 R@'eaffiche toute la fen@^etre@*
 @*
 @item Alt + fl@`eche gauche / Alt + fl@`eche droite
-Identique @`a F6 / F7@*
+Identique @`a F5 / F6@*
 @*
 @item Alt + A
 Sauter au tampon avec activit@'e (avec priorit@'e: highlight, message, autre)@*
diff --git a/weechat/doc/weechat_doc_pt.texi b/weechat/doc/weechat_doc_pt.texi
index 21b465924..368d39636 100644
--- a/weechat/doc/weechat_doc_pt.texi
+++ b/weechat/doc/weechat_doc_pt.texi
@@ -35,7 +35,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.0 - 12 de Fevereiro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.1-cvs - 22 de Fevereiro de 2005
 
 @image{weechat_image}
 
@@ -274,11 +274,11 @@ Repetir os ultimos comandos/mensagens@*
 @item PageUp / PageDown
 Navegar no hist@'orico da janela@*
 @*
-@item F6 / F7
-Ir para a janela anterior/seguinte@*
+@item F5 / F6
+Comute ao amortecedor anterior / seguinte@*
 @*
-@item F8
-Comute @`a janela seguinte@*
+@item F7 / F8
+Comute ao janela anterior / seguinte@*
 @*
 @item F10
 Apagar a @'ultima mensagem da barra do info@*
@@ -287,7 +287,7 @@ Apagar a @'ultima mensagem da barra do info@*
 Redesenhe a janela inteira@*
 @*
 @item Alt + Seta da esquerda / Alt + Seta da direita
-Identico a F6 / F7@*
+Identico a F5 / F6@*
 @*
 @item Alt + A
 Comute ao amortecedor seguinte com atividade (com prioridade:  destaque, mensagem, outra)@*
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index 714becff1..bb9c674c9 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -1571,6 +1571,25 @@ gui_switch_to_next_buffer (t_gui_window *window)
     gui_redraw_buffer (window->buffer);
 }
 
+/*
+ * gui_switch_to_previous_window: switch to previous window
+ */
+
+void
+gui_switch_to_previous_window (t_gui_window *window)
+{
+    if (!gui_ok)
+        return;
+    
+    /* if only one window then return */
+    if (gui_windows == last_gui_window)
+        return;
+    
+    gui_current_window = (window->prev_window) ? window->prev_window : last_gui_window;
+    gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
+    gui_redraw_buffer (gui_current_window->buffer);
+}
+
 /*
  * gui_switch_to_next_window: switch to next window
  */
diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c
index 472103e90..ca29e837b 100644
--- a/weechat/src/gui/curses/gui-input.c
+++ b/weechat/src/gui/curses/gui-input.c
@@ -70,19 +70,22 @@ gui_read_keyb ()
             case KEY_F(2):
             case KEY_F(3):
             case KEY_F(4):
-            case KEY_F(5):
             case KEY_F(9):
             case KEY_F(11):
             case KEY_F(12):
                 break;
             /* previous buffer in window */
-            case KEY_F(6):
+            case KEY_F(5):
                 gui_switch_to_previous_buffer (gui_current_window);
                 break;
             /* next buffer in window */
-            case KEY_F(7):
+            case KEY_F(6):
                 gui_switch_to_next_buffer (gui_current_window);
                 break;
+            /* previous window */
+            case KEY_F(7):
+                gui_switch_to_previous_window (gui_current_window);
+                break;
             /* next window */
             case KEY_F(8):
                 gui_switch_to_next_window (gui_current_window);
diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h
index 2268278aa..06edb434b 100644
--- a/weechat/src/gui/gui.h
+++ b/weechat/src/gui/gui.h
@@ -293,6 +293,7 @@ extern t_gui_buffer *gui_get_dcc_buffer ();
 extern void gui_switch_to_dcc_buffer ();
 extern void gui_switch_to_previous_buffer (t_gui_window *);
 extern void gui_switch_to_next_buffer (t_gui_window *);
+extern void gui_switch_to_previous_window (t_gui_window *);
 extern void gui_switch_to_next_window (t_gui_window *);
 extern void gui_move_page_up ();
 extern void gui_move_page_down ();