diff --git a/debian/changelog b/debian/changelog
index b5c0a4cb..f141dbdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,9 +9,10 @@ byobu (2.6) unreleased; urgency=low
   * byobu: If the user is running byobu with some arguments, but has
     not selected their profile yet, don't bother them with profile
     selection at this time, LP: #330322
+  * screen-launcher-install: handle non-interactive shells correctly,
+    LP: #380761
 
-
- -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 01 Jun 2009 08:22:57 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 01 Jun 2009 08:59:15 -0500
 
 byobu (2.5-0ubuntu1) karmic; urgency=low
 
diff --git a/screen-launcher-install b/screen-launcher-install
index b5904fa9..af4757d8 100755
--- a/screen-launcher-install
+++ b/screen-launcher-install
@@ -23,7 +23,7 @@ PKG="byobu"
 install_screen_launcher() {
 	dest=$1
 	launcher="/usr/bin/screen-launcher"
-	launcher_line="[ -x $launcher ] && $launcher"
+	launcher_line="`echo \$- | grep -qs i` && [ -x $launcher ] && $launcher"
 	# Add it at the end
 	echo "$launcher_line" >> "$dest"
 }