diff --git a/README b/README
index a008282e..498d0aa4 100644
--- a/README
+++ b/README
@@ -21,8 +21,9 @@ install locally, using the following instructions...
       make
  5) Install:
       make install
- 6) Update your PATH environment variable
-      echo "export PATH=$HOME/byobu/bin:$PATH" >> $HOME/.bashrc
+ 6) Update your PATH and BYOBU_PREFIX environment variables
+      echo "export BYOBU_PREFIX=$HOME/byobu" >> $HOME/.bashrc
+      echo "export PATH=$BYOBU_PREFIX/bin:$PATH" >> $HOME/.bashrc
       . $HOME/.bashrc
  7) Run:
       byobu
diff --git a/configure.ac b/configure.ac
index 28d768d2..a926cbcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,12 +29,3 @@ AC_OUTPUT(Makefile \
 	usr/share/doc/byobu/Makefile \
 	usr/lib/byobu/Makefile \
 	usr/share/man/man1/Makefile usr/bin/Makefile)
-
-if test -n "${prefix}" && test "${prefix}" != "/usr"; then
-	for i in usr/bin/byobu*; do
-		# This hackery seems necessary for Mac OSX and Solaris installs
-		sed -e "s:BYOBU_PREFIX=.*:BYOBU_PREFIX=\"${prefix}\":" "$i" > "$i.new"
-		mv -f "$i.new" "$i"
-		chmod 755 "$i"
-	done
-fi
diff --git a/debian/changelog b/debian/changelog
index 61ff90a3..7e4cbf44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ byobu (4.43) unreleased; urgency=low
     - fix select session to obey BYOBU_BACKEND
   * configure.ac, usr/bin/Makefile.am: LP: #869377
     - provide byobu-tmux and byobu-screen symlinks
+  * configure.ac, README: LP: #861291
+    - configure should not change files under vcs control
+    - compiling users need to ensure that BYOBU_PREFIX is set in
+      their environment
 
   [ Daniel Hahler ]
   * usr/bin/byobu, usr/bin/byobu-launcher-install, usr/bin/byobu-