diff --git a/debian/changelog b/debian/changelog
index 4192e29c..98528ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,18 @@ byobu (3.30) unreleased; urgency=low
     of logout behavior, when dpkg-configured globally by the sysadmin,
     LP: #741281
   * usr/share/byobu/profiles/common: fix bold color intensity, LP: #727466
+  * usr/bin/byobu-janitor, usr/bin/byobu-launch, usr/bin/byobu-launcher-
+    install, usr/bin/byobu-launcher-uninstall,
+    usr/share/byobu/keybindings/f-keys,
+    usr/share/byobu/keybindings/screen-escape-keys,
+    usr/share/man/man1/byobu.1:
+    - add a more permanent fix for LP: #604931
+    - update documentation
+  * usr/share/byobu/keybindings/f-keys,
+    usr/share/byobu/keybindings/screen-escape-keys:
+    - fix ctrl-f5
+  * debian/source/format, === removed directory debian/source: remove these
+    until bzr builddeb bug gets fixed
 
   [ Chaskiel Grundman ]
   * debian/postinst: correctly fix old-school screen-profiles era diversions
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 417dcf0c..ff837d4e 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -147,12 +147,12 @@ done
 # Affects: Upgrades from <= byobu-2.57 that autolaunch
 # If the global autolaunch is on, then remove duplicate entry in ~/.profile
 if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then
-	$SED -i -e "/ $PKG-launcher/d" "$HOME"/.profile || true
+	$SED -i -e "/ $PKG-launch/d" "$HOME"/.profile || true
 fi
 
 # Affects: Upgrades from <= byobu-2.70 that autolaunch
 # Update the byobu-launch line, if necessary
-if grep -qs " $PKG-launcher$" "$HOME"/.profile; then
+if grep -qs " $PKG-launch$" "$HOME"/.profile; then
 	$PKG-launcher-install
 fi
 
diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch
index e5b51bc2..a46db99d 100755
--- a/usr/bin/byobu-launch
+++ b/usr/bin/byobu-launch
@@ -19,5 +19,17 @@
 
 PKG="byobu"
 DATA="$HOME/.$PKG"
-case "$-" in *i*) byobu-launcher; esac;
-[ -e "$DATA/no-logout-on-detach" ] || exit 0
+case "$-" in
+	*i*)
+		byobu-launcher
+	;;
+esac
+# Wait very briefly for the no-logout flag to get written?
+sleep 0.1
+if [ -e "$DATA/no-logout-on-detach" ] || [ -e "/var/run/screen/S-$USER/byobu.no-logout" ]; then
+	# The user does not want to logout on byobu detach
+	rm -f "/var/run/screen/S-$USER/byobu.no-logout"	# Remove one-time no-logout flag, if it exists
+	true
+else
+	exit 0
+fi
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install
index f1093a77..5a4be513 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install
@@ -40,11 +40,7 @@ update_flag() {
 }
 
 install_launcher() {
-	if [ "$LOGOUT_ON_DETACH" = "1" ]; then
-		printf "%s\n" 'case "$-" in *i*) byobu-launcher && exit 0; esac;' >> "$1"
-	else
-		printf "%s\n" 'case "$-" in *i*) byobu-launcher; esac;' >> "$1"
-	fi
+	printf ". \$(which byobu-launch)\n" >> "$1"
 }
 
 # Sanitize the environment
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall
index b1a12da3..da4b84ae 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -27,7 +27,7 @@ which gsed 2>/dev/null && SED="gsed" || SED="sed"
 remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
-		$SED -i -e "/ $PKG-launcher/d" -e "/ screen-launcher/d" "$dest"
+		$SED -i -e "/ $PKG-launch/d" -e "/ screen-launch/d" "$dest"
 	fi
 }
 
diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys
index 80f6b412..eb3f5d58 100644
--- a/usr/share/byobu/keybindings/f-keys
+++ b/usr/share/byobu/keybindings/f-keys
@@ -62,7 +62,10 @@ bindkey "^[[5;3~" copy					# alt-pageup | scrollback
 bindkey "^[[6;3~" copy					# alt-pageup | scrollback
 
 # Make socket reconnection a little easier
-bindkey ";5~" eval 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh sockets
+bindkey "^[[15;5~" eval 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh sockets
+
+# Detach from an auto-launched byobu, but don't log out of the shell
+bindkey "^[[17;2~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach'   # ctrl-F6 | detach, but don't logout
 
 # toggle f-key keybindings off
 register d "^a:source $BYOBU_PREFIX/share/byobu/keybindings/screen-escape-keys^M"
diff --git a/usr/share/byobu/keybindings/screen-escape-keys b/usr/share/byobu/keybindings/screen-escape-keys
index 38074719..142e4da6 100644
--- a/usr/share/byobu/keybindings/screen-escape-keys
+++ b/usr/share/byobu/keybindings/screen-escape-keys
@@ -36,7 +36,8 @@ bindkey "^[O1;2R"
 bindkey "^[O1;2S"
 bindkey "^[[15;2~"
 bindkey "^[[17;2~"
-bindkey ";5~"
+bindkey "^[[15;5~"
+bindkey "^[[17;2~"
 
 # Use the following sequences for byobu functionality
 # SEQUENCE      ACTION                          F-Key equivalent
diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1
index c3d9cea6..b265d2d4 100644
--- a/usr/share/man/man1/byobu.1
+++ b/usr/share/man/man1/byobu.1
@@ -156,6 +156,10 @@ byobu keybindings can be user defined in /usr/share/byobu/keybindings/ (or withi
 
 \fBshift-F6\fP \- Remove this split
 
+\fBctrl-F5\fP \- Reconnect GPG and SSH sockets
+
+\fBctrl-F6\fP \- Detach, but do not logout
+
 \fBalt-pgup\fP \- Enter scrollback mode
 
 \fBalt-pgdn\fP \- Enter scrollback mode