diff --git a/byobu b/byobu
index ac877a47..03956c83 100755
--- a/byobu
+++ b/byobu
@@ -19,6 +19,12 @@
 
 PKG="byobu"
 
+# Nesting byobu inside of screen doesn't work well
+if [ "$TERM" = "screen" ]; then
+	echo `gettext "Exit the current screen session to run $PKG"`
+	exit 1
+fi
+
 # Sanitize the environment
 byobu-janitor --force
 
diff --git a/debian/changelog b/debian/changelog
index 2024d7ce..d6f6eba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,13 @@ byobu (2.17) unreleased; urgency=low
     efficient
   * byobu-launcher-uninstall: uninstall old screen-launcher entries too,
     LP: #391913
+  * byobu: detect and emit an error message if the user tries to run
+    byobu from within a screen session
 
   [ Ciemon Dunville ]
   * byobu.1: update description, add note about units of measure
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 25 Jun 2009 08:56:37 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 25 Jun 2009 16:05:04 -0500
 
 byobu (2.16-0ubuntu1) karmic; urgency=low