diff --git a/debian/changelog b/debian/changelog
index 3bb9d696..d2c1e3b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ byobu (2.81) unreleased; urgency=low
     - usr/lib/services
     - usr/bin/byobu-status-detail
     - usr/bin/byobu-reconnect-sockets
+    - usr/bin/byobu-launch, usr/bin/byobu-launcher-install,
+      usr/bin/byobu-launcher-uninstall:
+
   * usr/bin/byobu-config, usr/share/doc/byobu/help.txt: improve help
     text, per feedback from Turnkey Linux users
 
diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch
index 2b9304ed..24fc967c 100755
--- a/usr/bin/byobu-launch
+++ b/usr/bin/byobu-launch
@@ -17,4 +17,4 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-`echo \$- | grep -qs i` && byobu-launcher && exit 0
+case "$-" in *i*) byobu-launcher && exit 0; esac;
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install
index 1214b8aa..74aa8946 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install
@@ -21,7 +21,7 @@
 PKG="byobu"
 
 install_launcher() {
-	echo "\`echo \$- | grep -qs i\` && $PKG-launcher && exit 0" >> "$1"
+	printf "%s\n" 'case "$-" in *i*) byobu-launcher && exit 0; esac;' >> "$1"
 }
 
 # Sanitize the environment
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall
index 2113f5d3..ce380b55 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -23,8 +23,7 @@ PKG="byobu"
 remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
-		sed -i "/$PKG-launcher$/d" "$dest"
-		sed -i "/screen-launcher$/d" "$dest"
+		sed -i -e "/$PKG-launcher/d" -e "/screen-launcher/d" "$dest"
 	fi
 }