diff --git a/debian/changelog b/debian/changelog
index 824296dd..2d52da0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ byobu (4.38) unreleased; urgency=low
   * usr/share/byobu/profiles/tmux:
     - add window resizing keybindings
     - get scrollback alt-pageup working \o/
+    - set history limit to match byobu/screen
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 29 Sep 2011 14:46:58 -0400
 
diff --git a/usr/share/byobu/profiles/tmux b/usr/share/byobu/profiles/tmux
index 196ddde5..ccf2b047 100644
--- a/usr/share/byobu/profiles/tmux
+++ b/usr/share/byobu/profiles/tmux
@@ -47,8 +47,10 @@ bind-key -n C-F2 split-window -h
 bind-key -n C-F3 select-pane -L
 bind-key -n C-F4 select-pane -R
 bind-key -n S-F2 split-window -v
-bind-key -n S-F3 select-pane -D
-bind-key -n S-F4 select-pane -U
+bind-key -n S-F3 select-pane -U
+bind-key -n S-F4 select-pane -D
+#bind-key -n S-F3 select-pane -t:-1
+#bind-key -n S-F4 select-pane -t:+1
 bind-key -n S-F5 kill-pane -a
 bind-key -n C-F6 kill-pane
 bind-key -n C-Up resize-pane -U
@@ -60,6 +62,7 @@ set-option -g set-titles on
 set-option -g set-titles-string '#(whoami)@#H - byobu (#S)'
 set-option -g pane-active-border-fg magenta
 set-option -g pane-border-fg magenta
+set-option -g history-limit 10000
 
 set-window-option -g window-status-attr default
 set-window-option -g window-status-bg black