diff --git a/debian/changelog b/debian/changelog
index 786d2c65..9a502d9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ byobu (2.81) unreleased; urgency=low
     text, per feedback from Turnkey Linux users
   * debian/release,sh, debian/release-build.sh: drop, no longer needed,
     now in lp:~kirkland/+junk/bin
+  * usr/bin/byobu-janitor: clean up launch gardening code
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 16 Jun 2010 12:46:29 -0500
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 37be4dc0..145a720e 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -108,7 +108,7 @@ sed -i "s/^network-.*=/network=/" "$HOME/.$PKG/status"
 # Affects: Upgrades from <= byobu-2.16
 # screen-launcher was renamed byobu-launcher; if the user has byobu
 # set to auto-launch, update their configuration to use the byobu-launcher
-if grep -qs "screen-launcher$" "$HOME/.profile"; then
+if grep -qs " screen-launcher" "$HOME/.profile"; then
 	byobu-launcher-install
 fi
 
@@ -132,13 +132,13 @@ done
 # Affects: Upgrades from <= byobu-2.57 that autolaunch
 # If the global autolaunch is on, then remove duplicate entry in ~/.profile
 if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then
-	sed -i "/$PKG-launcher$/d" "$HOME"/.profile || true
+	sed -i "/ $PKG-launcher/d" "$HOME"/.profile || true
 fi
 
 # Affects: Upgrades from <= byobu-2.70 that autolaunch
 # Update the byobu-launch line, if necessary
-if grep -qs "^\`echo \$- | grep -qs i\` && $PKG-launcher$" "$HOME"/.profile; then
-	$PKG-launcher-uninstall && $PKG-launcher-install
+if grep -qs " $PKG-launcher$" "$HOME"/.profile; then
+	$PKG-launcher-install
 fi
 
 # Clean up flag