diff --git a/debian/changelog b/debian/changelog
index da0b73c2..c537b154 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ byobu (5.102) unreleased; urgency=medium
 
   * usr/share/byobu/keybindings/mouse.tmux.disable,
     usr/share/byobu/keybindings/mouse.tmux.enable: LP: #1514377
-    - use tmux 2.1's new 'mouse' option
+    - use tmux 2.1's new 'mouse' option, add some comments,
+      support old and new
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 14 Jan 2016 08:55:27 +0200
 
diff --git a/usr/share/byobu/keybindings/mouse.tmux.disable b/usr/share/byobu/keybindings/mouse.tmux.disable
index 33963556..4a299e24 100644
--- a/usr/share/byobu/keybindings/mouse.tmux.disable
+++ b/usr/share/byobu/keybindings/mouse.tmux.disable
@@ -1,7 +1,9 @@
-set -g mouse-resize-pane off
-set -g mouse-select-pane off
-set -g mouse-select-window off
-set -g mode-mouse off
-set -g mouse-utf8 off
-set -g mouse off
+# New, as of tmux 2.1
+set -g mouse on
+set -g mouse-utf8 on
+# Old, before tmux 2.1
+set -g mouse-resize-pane on
+set -g mouse-select-pane on
+set -g mouse-select-window on
+set -g mode-mouse on
 bind-key -n M-F12 source $BYOBU_PREFIX/share/byobu/keybindings/mouse.tmux.enable \; display-message "Mouse: OFF"
diff --git a/usr/share/byobu/keybindings/mouse.tmux.enable b/usr/share/byobu/keybindings/mouse.tmux.enable
index e96bf51d..184c9371 100644
--- a/usr/share/byobu/keybindings/mouse.tmux.enable
+++ b/usr/share/byobu/keybindings/mouse.tmux.enable
@@ -1,7 +1,9 @@
-set -g mouse-resize-pane on
-set -g mouse-select-pane on
-set -g mouse-select-window on
-set -g mode-mouse on
+# New, as of tmux 2.1
+set -g mouse off
 set -g mouse-utf8 off
-set -g mouse on
+# Old, before tmux 2.1
+set -g mouse-resize-pane off
+set -g mouse-select-pane off
+set -g mouse-select-window off
+set -g mode-mouse off
 bind-key -n M-F12 source $BYOBU_PREFIX/share/byobu/keybindings/mouse.tmux.disable \; display-message "Mouse: ON"