diff --git a/debian/changelog b/debian/changelog
index d8aa5d7e..cb8acdeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (5.102) unreleased; urgency=medium
 
+  [ Dustin Kirkland ]
   * usr/share/byobu/keybindings/mouse.tmux.disable,
     usr/share/byobu/keybindings/mouse.tmux.enable: LP: #1514377
     - use tmux 2.1's new 'mouse' option, add some comments,
@@ -22,6 +23,12 @@ byobu (5.102) unreleased; urgency=medium
     ugraph.1, usr/share/man/man1/byobu-ulevel.1:
     - replace http://byobu.co links to newly registered http://byobu.org
 
+  [ Jeffrey To ]
+  * usr/share/byobu/keybindings/tmux-screen-keys.conf:
+    - This adds '-c "#{pane_current_path}"' to new-window/split-window calls
+      in tmux-screen-keys.conf, matching similar calls in f-keys.tmux.
+
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 14 Jan 2016 08:55:27 +0200
 
 byobu (5.101-0ubuntu1) xenial; urgency=medium
diff --git a/usr/share/byobu/keybindings/tmux-screen-keys.conf b/usr/share/byobu/keybindings/tmux-screen-keys.conf
index b9d55cef..6db85a77 100644
--- a/usr/share/byobu/keybindings/tmux-screen-keys.conf
+++ b/usr/share/byobu/keybindings/tmux-screen-keys.conf
@@ -26,9 +26,9 @@ bind x lock-server
 
 # screen ^C c
 unbind ^C
-bind ^C new-window
+bind ^C new-window -c "#{pane_current_path}"
 unbind c
-bind c new-window
+bind c new-window -c "#{pane_current_path}"
 
 # detach ^D d
 unbind ^D
@@ -90,7 +90,7 @@ bind l refresh-client
 
 # split -v |
 unbind |
-bind | split-window
+bind | split-window -c "#{pane_current_path}"
 
 # :kB: focus up
 unbind Tab