diff --git a/debian/changelog b/debian/changelog
index bf2595da..016dfb79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,16 @@ byobu (5.58) unreleased; urgency=low
       tmux mouse support
     - display a message when toggling either on or off mouse or
       F-keys support
+  * usr/share/byobu/keybindings/f-keys.screen,
+    usr/share/byobu/keybindings/f-keys.screen.disable,
+    usr/share/byobu/keybindings/f-keys.tmux,
+    usr/share/byobu/keybindings/f-keys.tmux.disable,
+    usr/share/doc/byobu/help.tmux.txt: LP: #1218680
+    - byobu-screen has long supported Ctrl-A-~ which saves your scrollback
+      buffer to a file
+    - byobu-tmux had never quite implemented this
+    - Add a new keybinding to both byobu-screen and byobu-tmux that adds
+      this support, Shift-F9
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 Sep 2013 14:40:09 -0500
 
diff --git a/usr/share/byobu/keybindings/f-keys.screen b/usr/share/byobu/keybindings/f-keys.screen
index bdc1d9a3..c15bf415 100644
--- a/usr/share/byobu/keybindings/f-keys.screen
+++ b/usr/share/byobu/keybindings/f-keys.screen
@@ -71,6 +71,8 @@ bindkey -k k8 eval 'process x' 'process t'		# F8  | Re-title a window
 # No ctrl-F8 (restore layout) in Screen
 # No ctrl-shift-F8 (save layout) in Screen
 bindkey -k k9 $BYOBU_BACKEND -t config 0 byobu-config	# F9  | Configuration
+register s "[g G$>^h"					# Goes with Shift-F9 and F12 ~ definition
+bindkey "^[[20;2~" eval 'process x' 'process s' 'exec $BYOBU_SED -i -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN view $BYOBU_RUN_DIR/printscreen' # Shift-F9 | write the buffer to file, open in a new window
 							# F10 | 'toolbar' in gnome-terminal
 							# F11 | 'Full Screen' in gnome-terminal
 # No alt-F11 (break pane) in Screen
@@ -80,7 +82,6 @@ bindkey -k F2 process x					# F12 | Byobu's escape key
 bind $ $BYOBU_BACKEND -t status 0 byobu-status-detail	# F12 $ | show detailed status
 bind @ $BYOBU_BACKEND -t config 0 byobu-config		# F12 @ | Configuration
 bind R process r					# F12 R | Reload profile
-register s "[g G$>^h"					# Goes with F12 ~ definition
 bind ~ eval 'process x' 'process s' 'exec $BYOBU_SED -i -e "/./,/^$/!d" $BYOBU_RUN_DIR/printscreen' '$BYOBU_BACKEND -t PRINTSCREEN view $BYOBU_RUN_DIR/printscreen' # F12 ~ | write the buffer to file, open in a new window
 
 register d ":source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.screen.disable^M"
diff --git a/usr/share/byobu/keybindings/f-keys.screen.disable b/usr/share/byobu/keybindings/f-keys.screen.disable
index 19508887..8b5e22ad 100644
--- a/usr/share/byobu/keybindings/f-keys.screen.disable
+++ b/usr/share/byobu/keybindings/f-keys.screen.disable
@@ -77,4 +77,5 @@ bindkey "^[[5;3~"
 bindkey "^[[6;3~"
 bindkey -k k8
 bindkey -k k9
+bindkey "^[[20;2~"
 bindkey -k F2
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index ab17b47d..c1584cc0 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -69,6 +69,7 @@ bind-key -n S-F8 next-layout
 bind-key -n C-F8 new-window -k "byobu-layout restore; clear; $SHELL"
 bind-key -n C-S-F8 command-prompt -p "Save byobu layout as:" "run-shell \"byobu-layout save '%%'\""
 bind-key -n F9 new-window -k -n config byobu-config
+bind-key -n S-F9 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscreen" \; delete-buffer \; new-window -n "PRINTSCREEN" "view $BYOBU_RUN_DIR/printscreen"
 bind-key -n M-F11 break-pane
 bind-key -n C-F11 join-pane -h -s :. -t :-1
 bind-key -n S-F11 join-pane -v -s :. -t :-1
diff --git a/usr/share/byobu/keybindings/f-keys.tmux.disable b/usr/share/byobu/keybindings/f-keys.tmux.disable
index ab5e180a..5920fb3f 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux.disable
+++ b/usr/share/byobu/keybindings/f-keys.tmux.disable
@@ -69,6 +69,7 @@ unbind-key -n C-F8
 unbind-key -n C-S-F8
 unbind-key -n S-F8
 unbind-key -n F9
+unbind-key -n S-F9
 unbind-key -n M-F11
 unbind-key -n C-F11
 unbind-key -n S-F11
diff --git a/usr/share/doc/byobu/help.tmux.txt b/usr/share/doc/byobu/help.tmux.txt
index 8ec2f39c..0a8b2aa6 100644
--- a/usr/share/doc/byobu/help.tmux.txt
+++ b/usr/share/doc/byobu/help.tmux.txt
@@ -31,6 +31,7 @@ and some convenient keybindings:
     Ctrl-F8                      Restore a split-pane layout
     Ctrl-Shift-F8                Save the current split-pane layout
   F9                             Launch byobu-config window
+    Shift-F9                     Save history to $BYOBU_RUN_DIR/printscreen
   F10                            * Used by X11 *
   F11                            * Used by X11 *
     Alt-F11                      Expand split to a full window