diff --git a/byobu-janitor b/byobu-janitor
index 7d5c24f9..c0a0a5b3 100755
--- a/byobu-janitor
+++ b/byobu-janitor
@@ -108,7 +108,7 @@ sed -i "s/^network.*=/network=/" "$HOME/.$PKG/status"
 # 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
-	/usr/share/$PKG/byobu-launcher-install
+	byobu-launcher-install
 fi
 
 # Affects: Upgrades from <= byobu-2.25
diff --git a/byobu-launcher-install b/byobu-launcher-install
index 6f32b620..30385601 100755
--- a/byobu-launcher-install
+++ b/byobu-launcher-install
@@ -31,7 +31,7 @@ install_launcher() {
 }
 
 # Sanitize the environment
-/usr/share/$PKG/byobu-launcher-uninstall || true
+byobu-launcher-uninstall || true
 
 # Install in $HOME/.profile unconditionally
 install_launcher "$HOME/.profile"
diff --git a/byobu-launcher-uninstall b/byobu-launcher-uninstall
index d1767b9e..2001a2e4 100755
--- a/byobu-launcher-uninstall
+++ b/byobu-launcher-uninstall
@@ -18,12 +18,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+PKG="byobu"
 
 remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
-		sed -i '/byobu-launcher$/d' "$dest"
-		sed -i '/screen-launcher$/d' "$dest"
+		sed -i "/$PKG-launcher$/d" "$dest"
+		sed -i "/screen-launcher$/d" "$dest"
 	fi
 	# the install disabled motd printing; re-enable
 	rm "$HOME"/.hushlogin 2>/dev/null || true
diff --git a/debian/install b/debian/install
index d21a8f40..32b460a7 100644
--- a/debian/install
+++ b/debian/install
@@ -14,8 +14,8 @@ byobu-reconnect-sockets usr/bin
 byobu-status usr/bin
 byobu-status-detail usr/bin
 byobu-janitor usr/bin
-byobu-launcher-install usr/share/byobu
-byobu-launcher-uninstall usr/share/byobu
+byobu-launcher-install usr/bin
+byobu-launcher-uninstall usr/bin
 motd+shell usr/bin
 byobu-launcher usr/bin
 byobu-export usr/bin
diff --git a/rpm/byobu.spec b/rpm/byobu.spec
index f24a3bfd..4aa02d38 100644
--- a/rpm/byobu.spec
+++ b/rpm/byobu.spec
@@ -56,8 +56,8 @@ cp -ar byobu ${RPM_BUILD_ROOT}/usr/bin
 cp -ar byobu-config ${RPM_BUILD_ROOT}/usr/bin
 cp -ar byobu-status ${RPM_BUILD_ROOT}/usr/bin
 cp -ar byobu-status-detail ${RPM_BUILD_ROOT}/usr/bin
-cp -ar byobu-launcher-install ${RPM_BUILD_ROOT}/usr/share/byobu
-cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/share/byobu
+cp -ar byobu-launcher-install ${RPM_BUILD_ROOT}/usr/bin
+cp -ar byobu-launcher-uninstall ${RPM_BUILD_ROOT}/usr/bin
 cp -ar motd+shell ${RPM_BUILD_ROOT}/usr/bin
 cp -ar byobu-launcher ${RPM_BUILD_ROOT}/usr/bin
 cp -ar byobu-janitor ${RPM_BUILD_ROOT}/usr/bin
@@ -133,8 +133,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/byobu/profiles/light_purple
 /usr/share/byobu/profiles/light_red
 /usr/share/byobu/profiles/light_yellow
-/usr/share/byobu/byobu-launcher-install
-/usr/share/byobu/byobu-launcher-uninstall
+/usr/bin/byobu-launcher-install
+/usr/bin/byobu-launcher-uninstall
 /usr/share/byobu/windows/common
 /etc/byobu
 %doc README