diff --git a/byobu-launcher b/byobu-launcher
index 374edbcb..c94b8bf1 100755
--- a/byobu-launcher
+++ b/byobu-launcher
@@ -19,6 +19,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 [ -z "$STY" ] || exit 0
+case "$TERM" in
+	*screen*) exit 0 ;;
+esac
 
 out=`screen -ls 2>/dev/null` || true
 if echo "$out" | grep -qsi "^No Sockets found in "; then
diff --git a/debian/changelog b/debian/changelog
index 1a964dc5..87464485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 byobu (2.30) unreleased; urgency=low
 
-  * UNRELEASED
+  * byobu-launcher: make sure that we're not already in a screen session
+    before launching or re-attaching byobu
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 26 Aug 2009 15:35:30 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 28 Aug 2009 10:48:38 -0500
 
 byobu (2.29-0ubuntu1) karmic; urgency=low