diff --git a/debian/changelog b/debian/changelog
index 3b735e60..7265f033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ byobu (4.36) unreleased; urgency=low
 
   * usr/bin/byobu-select-profile: LP: #860574
     - fix color selection;  profile is no longer a symlink
+  * usr/bin/byobu-launch: LP: #860634
+    - disable auto launch of byobu, when a serial console is detected
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 23 Sep 2011 11:09:07 -0500
 
diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch
index ce705d8b..983c1aca 100755
--- a/usr/bin/byobu-launch
+++ b/usr/bin/byobu-launch
@@ -29,7 +29,17 @@
 #      $HOME/.bashrc:  export LC_BYOBU=0
 #    or edit your sshd_config, ssh_config, and set:
 #      $HOME/.bashrc:  export BYOBU_DISABLE=1
-if [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ] && [ -O "$HOME" ]; then
+
+_tty=$(tty)
+if [ "${_tty#/dev/ttyS}" != "$_tty" ]; then
+	# Don't autolaunch byobu on serial consoles
+	# You can certainly run 'byobu' manually, though
+	echo
+	echo "INFO: Disabling auto-launch of Byobu on this serial console"
+	echo "INFO: You can still run 'byobu' manually at the command line"
+	echo
+elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ] && [ -O "$HOME" ]; then
+	unset _tty
 	BYOBU_SOURCED_PROFILE=1
 	PKG="byobu"
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
@@ -63,5 +73,6 @@ if [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DI
 		esac
 	fi
 fi
+unset _tty
 true
 # vi: syntax=sh ts=4 noexpandtab