diff --git a/debian/changelog b/debian/changelog
index 9e24106e..bc1e4668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (4.43) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * usr/bin/byobu, usr/lib/byobu/ip_address, usr/share/man/man1/byobu.1:
     - support IP_EXTERNAL fetching, LP: #873736
     - put ip address in the terminal title bar, since we ran out of room
@@ -7,6 +8,10 @@ byobu (4.43) unreleased; urgency=low
   * usr/bin/byobu-select-session: LP: #869390
     - fix select session to obey BYOBU_BACKEND
 
+  [ Daniel Hahler ]
+  * usr/bin/byobu, usr/bin/byobu-launcher-install, usr/bin/byobu-
+    launcher-uninstall: Use BYOBU_PREFIX explicitly, LP: #861302
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 21 Oct 2011 13:43:57 -0500
 
 byobu (4.42-0ubuntu1) precise; urgency=low
diff --git a/usr/bin/byobu b/usr/bin/byobu
index 3eb00055..2461b388 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -94,7 +94,7 @@ case $BYOBU_BACKEND in
 		fi
 		export BYOBU_WINDOWS
 		# Launch shell, unless the user has default windows set to launch
-		uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="-t ${SHELL##*/} byobu-shell"
+		uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="-t ${SHELL##*/} ${BYOBU_PREFIX}/bin/byobu-shell"
 		# Check if our terminfo supports 256 colors
 		if command -v tput >/dev/null; then
 			if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install
index 0adb4276..93d251b2 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install
@@ -42,7 +42,7 @@ update_flag() {
 }
 
 install_launcher() {
-	printf "_byobu_sourced=1 . byobu-launch\n" >> "$1"
+	printf "_byobu_sourced=1 . ${BYOBU_PREFIX}/bin/byobu-launch\n" >> "$1"
 }
 
 # Sanitize the environment
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall
index 0b34b33a..9ad5b208 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -25,7 +25,8 @@ PKG="byobu"
 remove_launcher() {
 	dest=$1
 	if [ -w "$dest" ]; then
-		$SED -i -e "/ $PKG-launch/d" -e "/ screen-launch/d" "$dest"
+		# keep any comments, and remove lines invoking byobu:
+		$SED -i -e '/^\s*#/n' -e "/\b$PKG-launch\$/d" -e "/ screen-launch/d" "$dest"
 	fi
 }