diff --git a/ChangeLog b/ChangeLog
index a9295f099..bfaaeecbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2011-12-19
+v0.3.7-dev, 2011-12-25
 
 
 Version 0.3.7 (under dev!)
 --------------------------
 
+* core: set option weechat.look.mouse when mouse state is changed with command
+  /mouse
 * core: add type "hashtable" for hdata
 * core: add signal "buffer_line_added"
 * core: add default keys "meta2-1;5D" and "meta2-1;5C" (ctrl+left/right) for
diff --git a/src/gui/curses/gui-curses-mouse.c b/src/gui/curses/gui-curses-mouse.c
index d37cef5ad..6ca1cff9e 100644
--- a/src/gui/curses/gui-curses-mouse.c
+++ b/src/gui/curses/gui-curses-mouse.c
@@ -90,6 +90,7 @@ gui_mouse_enable ()
 {
     gui_mouse_enabled = 1;
     fprintf (stderr, "\033[?1005h\033[?1000h\033[?1002h");
+    config_file_option_set (config_look_mouse, "1", 1);
 }
 
 /*
@@ -101,6 +102,7 @@ gui_mouse_disable ()
 {
     gui_mouse_enabled = 0;
     fprintf (stderr, "\033[?1002l\033[?1000l\033[?1005l");
+    config_file_option_set (config_look_mouse, "0", 1);
 }
 
 /*