diff --git a/debian/changelog b/debian/changelog
index 2bf62d2e..e765f470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ byobu (4.51) unreleased; urgency=low
   * usr/lib/byobu/include/mondrian, usr/share/byobu/keybindings/f-
     keys.tmux: LP: #894432
     - fix two old references to /usr/bin/byobu-mondrian
+  * usr/bin/byobu-select-session, usr/share/byobu/keybindings/f-
+    keys.tmux, usr/share/byobu/profiles/tmux: LP: #894440
+    - fix a few hardcoded references to /usr -> $BYOBU_PREFIX
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 23 Nov 2011 13:41:31 -0600
 
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session
index e9f3a0e8..340a2df9 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
 #
 #    byobu-select-session
 #    Copyright (C) 2010 Canonical Ltd.
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index 6bd03dee..93f770e4 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -22,9 +22,9 @@
 set -g prefix ^A,F12
 
 # Byobu's Keybindings
-# Documented in: /usr/share/doc/byobu/help.tmux.txt
+# Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt
 bind-key -n F1 new-window -k -n config byobu-config
-bind-key -n S-F1 new-window -k -n help '$BYOBU_PAGER /usr/share/doc/byobu/help.tmux.txt'
+bind-key -n S-F1 new-window -k -n help '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'
 bind-key -n F2 new-window
 bind-key -n C-F2 display-panes \; split-window -h
 bind-key -n S-F2 display-panes \; split-window -v
@@ -49,7 +49,7 @@ bind-key -n C-Up resize-pane -U
 bind-key -n C-Down resize-pane -D
 bind-key -n C-Left resize-pane -L
 bind-key -n C-Right resize-pane -R
-bind-key -n F5 source /usr/share/byobu/profiles/tmuxrc
+bind-key -n F5 source $BYOBU_PREFIX/share/byobu/profiles/tmuxrc
 bind-key -n S-F5 next-layout
 bind-key -n C-F5 send-keys ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets" \; send-keys Enter
 bind-key -n F6 detach
diff --git a/usr/share/byobu/profiles/tmux b/usr/share/byobu/profiles/tmux
index 9ea4cb00..e3410a73 100644
--- a/usr/share/byobu/profiles/tmux
+++ b/usr/share/byobu/profiles/tmux
@@ -26,9 +26,9 @@ new-window -d byobu-janitor
 set -s escape-time 0
 
 # Change to Screen's ctrl-a escape sequence
-source /usr/share/doc/tmux/examples/screen-keys.conf
+source $BYOBU_PREFIX/share/doc/tmux/examples/screen-keys.conf
 # On Archlinux, this file is not under the same directory
-source /usr/share/tmux/screen-keys.conf
+source $BYOBU_PREFIX/share/tmux/screen-keys.conf
 
 # Add F12 to the prefix list
 set -g prefix ^A,F12