diff --git a/debian/changelog b/debian/changelog
index c65e68eb..52b0dcc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ byobu (3.20) unreleased; urgency=low
     usr/share/man/man1/byobu-select-session.1: support "hiding"
     sessions, by prepending a "." to the session name, LP: #599334
   * usr/share/man/man1/byobu-launcher.1: update documentation
+  * usr/bin/byobu-launcher-install, usr/share/man/man1/byobu-launcher-
+    install.1, usr/share/man/man1/byobu-launcher-uninstall.1,
+    usr/share/man/man1/Makefile.am:
+    - add an option for -n|--no-logout to byobu-launcher-install,
+      document changes in new manpages, LP: #604931
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 28 Dec 2010 00:05:13 -0600
 
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install
index 0a61c75e..772402ec 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install
@@ -21,8 +21,21 @@
 PKG="byobu"
 DATA="$HOME/.$PKG"
 
+LOGOUT_ON_DETACH=1
+for i in $@; do
+	case "$i" in
+		-n|--no-logout)
+			LOGOUT_ON_DETACH=0
+		;;
+	esac
+done
+
 install_launcher() {
-	printf "%s\n" 'case "$-" in *i*) byobu-launcher && exit 0; esac;' >> "$1"
+	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
 }
 
 # Sanitize the environment
diff --git a/usr/share/man/man1/Makefile.am b/usr/share/man/man1/Makefile.am
index 41da813c..02dea548 100644
--- a/usr/share/man/man1/Makefile.am
+++ b/usr/share/man/man1/Makefile.am
@@ -1,2 +1,2 @@
-man_MANS = byobu.1  byobu-config.1  byobu-export.1  byobu-launcher.1  byobu-reconnect-sockets.1  byobu-select-profile.1  byobu-select-session.1  byobu-status.1  byobu-status-detail.1  shell.1
+man_MANS = byobu.1  byobu-config.1  byobu-export.1  byobu-launcher.1  byobu-reconnect-sockets.1  byobu-select-profile.1  byobu-select-session.1  byobu-status.1  byobu-status-detail.1  shell.1, byobu-launcher-install.1, byobu-launcher-uninstall.1
 
diff --git a/usr/share/man/man1/byobu-launcher-install.1 b/usr/share/man/man1/byobu-launcher-install.1
new file mode 100644
index 00000000..da17e1a3
--- /dev/null
+++ b/usr/share/man/man1/byobu-launcher-install.1
@@ -0,0 +1,27 @@
+.TH byobu\-launcher\-install 1 "3 Jan 2010" byobu "byobu"
+.SH NAME
+byobu\-launcher\-install \- Byobu Launcher installation utility
+
+.SH SYNOPSIS
+byobu\-launcher\-install [\-n|\-\-no\-logout]
+
+.SH DESCRIPTION
+\fBbyobu\-launcher\-install\fP(1) is a simple utilty that will add a line to your \fI$HOME/.profile\fP file which launches \fBbyobu\fP(1) any time you login through \fBssh\fP(1) or on a \fBconsole\fP(4).
+
+By default, when users detach from the \fBbyobu\fP(1) session they will also logout.  Users can change this behavior by adding the [\-n|\-\-no\-logout] option when they run \fBbyobu\-launcher\-install\fP(1).
+
+You can disable this behavior entirely at any time with the \fBbyobu\-launcher\-uninstall\fB(1) utility.
+
+.SH "SEE ALSO"
+.PD 0
+.TP
+\fBscreen\fP(1), \fBbyobu\fP(1), \fBssh\fP(1), \fBconsole\fP(4), \fBbyobu\-launcher\-uninstall\fP(1)
+
+.TP
+\fIhttp://launchpad.net/byobu\fP
+.PD
+
+.SH AUTHOR
+This manpage and the utility were written by Dustin Kirkland <kirkland@canonical.com> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
diff --git a/usr/share/man/man1/byobu-launcher-uninstall.1 b/usr/share/man/man1/byobu-launcher-uninstall.1
new file mode 100644
index 00000000..b46d8219
--- /dev/null
+++ b/usr/share/man/man1/byobu-launcher-uninstall.1
@@ -0,0 +1,23 @@
+.TH byobu\-launcher\-uninstall 1 "3 Jan 2010" byobu "byobu"
+.SH NAME
+byobu\-launcher\-uninstall \- Byobu Launcher uninstallation utility
+
+.SH SYNOPSIS
+byobu\-launcher\-uninstall
+
+.SH DESCRIPTION
+\fBbyobu\-launcher\-uninstall\fP(1) is a simple utilty that removes the line added to your \fI$HOME/.profile\fP by \fBbyobu\-launcher\-install\fP(1) which launches \fBbyobu\fP(1) any time you login through \fBssh\fP(1) or on a \fBconsole\fP(4).
+
+.SH "SEE ALSO"
+.PD 0
+.TP
+\fBscreen\fP(1), \fBbyobu\fP(1), \fBssh\fP(1), \fBconsole\fP(4), \fBbyobu\-launcher\-install\fP(1)
+
+.TP
+\fIhttp://launchpad.net/byobu\fP
+.PD
+
+.SH AUTHOR
+This manpage and the utility were written by Dustin Kirkland <kirkland@canonical.com> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.