diff --git a/debian/changelog b/debian/changelog
index 63f54c62..0b845870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ byobu (3.15) unreleased; urgency=low
   * usr/lib/byobu/raid: only match one raid rebuild (the first one)
   * debian/rules, usr/share/applications/byobu.desktop: try to get
     the icon working in Unity, LP: #683444
+  * usr/share/byobu/keybindings/f-keys,
+    usr/share/byobu/keybindings/screen-escape-keys,
+    usr/share/man/man1/byobu.1: add some keybindings for better handling
+    of screen splits, LP: #686847
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 07 Dec 2010 21:03:29 -0600
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 07 Dec 2010 21:19:19 -0600
 
 byobu (3.14-0ubuntu1) natty; urgency=low
 
diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys
index e4a53681..85287e58 100644
--- a/usr/share/byobu/keybindings/f-keys
+++ b/usr/share/byobu/keybindings/f-keys
@@ -41,6 +41,18 @@ bind R process r					# ctrl-a R | Reload profile
 register s "^a[g G$>^h"					# Goes with ^a~ definition
 bind ~ eval 'process s' 'exec sed -i -e "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # ctrl-a ~ | write the buffer to file
 
+# Hotkeys for splits
+bindkey -k "^[O1;2Q" split					# shift-F2 | horizontal split
+bindkey -k "^[O1;5Q" split -v				# ctrl-F2  | vertical split
+bindkey -k "^[O1;2R" focus up				# shift-F3 | focus up
+bindkey -k "^[O1;2S" focus down				# shift-F4 | focus down
+bindkey -k "^[[15;2~" only					# shift-F5 | kill all splits
+bindkey -k "^[[17;2~" remove				# shift-F6 | kill this split
+
+# Make it more logical how to enter scrollback
+bindkey -k "^[[5;3~" copy					# alt-pageup | scrollback
+bindkey -k "^[[6;3~" copy					# alt-pageup | scrollback
+
 # toggle f-key keybindings off
 register d "^a:source $BYOBU_PREFIX/share/byobu/keybindings/screen-escape-keys^M"
-bind ! eval 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'
+bind ! eval 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'	# ctrl-a-! | toggle on/off f-keys
diff --git a/usr/share/byobu/keybindings/screen-escape-keys b/usr/share/byobu/keybindings/screen-escape-keys
index 75103c3b..e0bd0f77 100644
--- a/usr/share/byobu/keybindings/screen-escape-keys
+++ b/usr/share/byobu/keybindings/screen-escape-keys
@@ -30,6 +30,12 @@ bindkey -k k7
 bindkey -k k8
 bindkey -k k9
 bindkey -k F2
+bindkey -k "^[O1;2Q"
+bindkey -k "^[O1;5Q"
+bindkey -k "^[O1;2R"
+bindkey -k "^[O1;2S"
+bindkey -k "^[[15;2~"
+bindkey -k "^[[17;2~"
 
 # Use the following sequences for byobu functionality
 # SEQUENCE      ACTION                          F-Key equivalent
diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1
index ea865310..61fe1ee6 100644
--- a/usr/share/man/man1/byobu.1
+++ b/usr/share/man/man1/byobu.1
@@ -136,6 +136,22 @@ byobu keybindings can be user defined in /usr/share/byobu/keybindings/ (or withi
 
 \fBF12\fP \-  Lock this terminal
 
+\fBshift-F2\fP \- Split the screen horizontally
+
+\fBctrl-F2\fP \- Split the screen vertically
+
+\fBshift-F3\fP \- Shift the focus to the previous split region
+
+\fBshift-F4\fP \- Shift the focus to the next split region
+
+\fBshift-F5\fP \- Join all splits
+
+\fBshift-F6\fP \- Remove this split
+
+\fBalt-pgup\fP \- Enter scrollback mode
+
+\fBalt-pgdn\fP \- Enter scrollback mode
+
 \fBCtrl-a $\fP \- show detailed status
 
 \fBCtrl-a R\fP \- Reload profile