diff --git a/debian/changelog b/debian/changelog
index 5221c621..6dc4199c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (4.40) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu-janitor, usr/share/byobu/profiles/tmux:
+    - use screen keys by default (should probably make this configurable)
+    - allow local overrides in local tmux.conf
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 05 Oct 2011 18:05:32 -0400
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 14bf0262..d689da9c 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -61,6 +61,7 @@ fi
 [ -r "$BYOBU_CONFIG_DIR/keybindings" ] || echo "source $BYOBU_PREFIX/share/$PKG/keybindings/common" > "$BYOBU_CONFIG_DIR/keybindings"
 [ -r "$BYOBU_CONFIG_DIR/windows" ] || touch "$BYOBU_CONFIG_DIR/windows"
 [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
+[ -r "$BYOBU_CONFIG_DIR/.tmux.conf" ] || touch "$BYOBU_CONFIG_DIR/.tmux.conf"
 for f in status statusrc; do
 	if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then
 		# Copy from skeleton, if possible
diff --git a/usr/share/byobu/profiles/tmux b/usr/share/byobu/profiles/tmux
index 45b500a2..653d6850 100644
--- a/usr/share/byobu/profiles/tmux
+++ b/usr/share/byobu/profiles/tmux
@@ -20,16 +20,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
+# Initialize environment, clean up
 set-environment -g BYOBU_BACKEND tmux
 new-window -d byobu-janitor
-
-# Change to Screen's ctrl-a escape sequence
-set-option -g prefix C-a
-unbind-key C-b
-bind-key C-a send-prefix
-bind-key a send-prefix
 set -s escape-time 0
 
+# Change to Screen's ctrl-a escape sequence
+source /usr/share/doc/tmux/examples/screen-keys.conf
+
+# Byobu's Keybindings
 bind-key -n F1 new-window -k -t config byobu-config
 bind-key -n F2 new-window
 bind-key -n F3 previous-window
@@ -102,3 +101,6 @@ set -g status-left '#(byobu-status tmux_left)['
 set -g status-right ']#(byobu-status tmux_right)'
 set -g message-bg magenta
 set -g message-fg white
+
+# Allow local overrides
+source $BYOBU_CONFIG_DIR/.tmux.conf