diff --git a/debian/changelog b/debian/changelog
index af13f8f0..32974432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ byobu (5.70) unreleased; urgency=low
 
   * usr/share/byobu/keybindings/f-keys.tmux:
     - fix navigation among sessions
+  * usr/share/byobu/keybindings/f-keys.tmux,
+    usr/share/byobu/keybindings/f-keys.tmux.disable,
+    usr/share/doc/byobu/help.tmux.txt:
+    - change the rarely used Ctrl-F8 keybinding to rename the current
+       session
+    - move the restore-a-split-layout to Shift-Alt-F8
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 17 Dec 2013 14:27:43 -0700
 
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index 4598d86a..51088353 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -66,8 +66,9 @@ bind-key -n S-F7 capture-pane -S -32768 \; save-buffer "$BYOBU_RUN_DIR/printscre
 bind-key -n M-NPage copy-mode \; send-keys NPage
 bind-key -n M-PPage copy-mode \; send-keys PPage
 bind-key -n F8 command-prompt -p "(rename-window) " "rename-window '%%'"
+bind-key -n C-F8 command-prompt -p "(rename-session) " "rename-session '%%'"
 bind-key -n S-F8 next-layout
-bind-key -n C-F8 new-window -k "byobu-layout restore; clear; $SHELL"
+bind-key -n M-S-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 M-F11 break-pane
diff --git a/usr/share/byobu/keybindings/f-keys.tmux.disable b/usr/share/byobu/keybindings/f-keys.tmux.disable
index 8d4faa91..e886adcc 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 M-PPage
 unbind-key -n F8
 unbind-key -n C-F8
 unbind-key -n C-S-F8
+unbind-key -n M-S-F8
 unbind-key -n S-F8
 unbind-key -n F9
 unbind-key -n M-F11
diff --git a/usr/share/doc/byobu/help.tmux.txt b/usr/share/doc/byobu/help.tmux.txt
index 8cc43ae3..9cf62682 100644
--- a/usr/share/doc/byobu/help.tmux.txt
+++ b/usr/share/doc/byobu/help.tmux.txt
@@ -29,8 +29,9 @@ and some convenient keybindings:
     Alt-PageUp/PageDown          Enter and move through scrollback
     Shift-F7                     Save history to $BYOBU_RUN_DIR/printscreen
   F8                             Rename the current window
+    Ctrl-F8                      Rename the current session
     Shift-F8                     Toggle through split arrangements
-    Ctrl-F8                      Restore a split-pane layout
+    Alt-Shift-F8                 Restore a split-pane layout
     Ctrl-Shift-F8                Save the current split-pane layout
   F9                             Launch byobu-config window
   F10                            * Used by X11 *