diff --git a/configure.ac b/configure.ac
index c87982ad..9e081973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,38 @@ AC_PROG_LN_S
 AC_OUTPUT(Makefile \
 	etc/byobu/Makefile \
 	etc/profile.d/Makefile \
+	etc/profile.d/Z97-byobu.sh
 	usr/share/applications/Makefile \
+	usr/bin/byobu \
+	usr/bin/byobu-config \
+	usr/bin/byobu-ctrl-a \
+	usr/bin/byobu-disable \
+	usr/bin/byobu-disable-prompt \
+	usr/bin/byobu-enable \
+	usr/bin/byobu-enable-prompt \
+	usr/bin/byobu-export \
+	usr/bin/byobu-janitor \
+	usr/bin/byobu-launch \
+	usr/bin/byobu-launcher \
+	usr/bin/byobu-launcher-install \
+	usr/bin/byobu-launcher-uninstall \
+	usr/bin/byobu-layout \
+	usr/bin/byobu-prompt \
+	usr/bin/byobu-quiet \
+	usr/bin/byobu-reconnect-sockets \
+	usr/bin/byobu-select-backend \
+	usr/bin/byobu-select-profile \
+	usr/bin/byobu-select-session \
+	usr/bin/byobu-shell \
+	usr/bin/byobu-silent \
+	usr/bin/byobu-status \
+	usr/bin/byobu-status-detail \
+	usr/bin/byobu-ugraph \
+	usr/bin/byobu-ulevel \
+	usr/lib/byobu/include/config.py \
+	usr/lib/byobu/include/dirs \
+	usr/lib/byobu/include/toggle-utf8 \
+	usr/share/byobu/tests/byobu-time-notifications \
 	usr/share/byobu/keybindings/Makefile \
 	usr/share/byobu/pixmaps/Makefile \
 	usr/share/byobu/profiles/Makefile \
diff --git a/debian/changelog b/debian/changelog
index d99a47c9..e1a89c3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,40 @@ byobu (5.74) unreleased; urgency=low
     - add support for yet another batter type (Android)
     - thanks to Felix Krull for the initial patch
 
+  [ Ryo ONODERA ]
+  * configure.ac, etc/profile.d/Z97-byobu.sh => etc/profile.d/Z97-
+    byobu.sh.in, usr/bin/byobu-config => usr/bin/byobu-config.in,
+    usr/bin/byobu-ctrl-a => usr/bin/byobu-ctrl-a.in, usr/bin/byobu-
+    disable-prompt => usr/bin/byobu-disable-prompt.in, usr/bin/byobu-
+    disable => usr/bin/byobu-disable.in, usr/bin/byobu-enable-prompt =>
+    usr/bin/byobu-enable-prompt.in, usr/bin/byobu-enable =>
+    usr/bin/byobu-enable.in, usr/bin/byobu-export => usr/bin/byobu-
+    export.in, usr/bin/byobu-janitor => usr/bin/byobu-janitor.in,
+    usr/bin/byobu-launcher-install => usr/bin/byobu-launcher-install.in,
+    usr/bin/byobu-launcher-uninstall => usr/bin/byobu-launcher-
+    uninstall.in, usr/bin/byobu-launcher => usr/bin/byobu-launcher.in,
+    usr/bin/byobu-launch => usr/bin/byobu-launch.in, usr/bin/byobu-
+    layout => usr/bin/byobu-layout.in, usr/bin/byobu-prompt =>
+    usr/bin/byobu-prompt.in, usr/bin/byobu-quiet => usr/bin/byobu-
+    quiet.in, usr/bin/byobu-reconnect-sockets => usr/bin/byobu-
+    reconnect-sockets.in, usr/bin/byobu-select-backend => usr/bin/byobu-
+    select-backend.in, usr/bin/byobu-select-profile => usr/bin/byobu-
+    select-profile.in, usr/bin/byobu-select-session => usr/bin/byobu-
+    select-session.in, usr/bin/byobu-shell => usr/bin/byobu-shell.in,
+    usr/bin/byobu-silent => usr/bin/byobu-silent.in, usr/bin/byobu-
+    status-detail => usr/bin/byobu-status-detail.in, usr/bin/byobu-
+    status => usr/bin/byobu-status.in, usr/bin/byobu-ugraph =>
+    usr/bin/byobu-ugraph.in, usr/bin/byobu-ulevel => usr/bin/byobu-
+    ulevel.in, usr/bin/byobu => usr/bin/byobu.in,
+    usr/lib/byobu/include/config.py =>
+    usr/lib/byobu/include/config.py.in, usr/lib/byobu/include/dirs =>
+    usr/lib/byobu/include/dirs.in, usr/lib/byobu/include/toggle-utf8 =>
+    usr/lib/byobu/include/toggle-utf8.in, usr/share/byobu/tests/byobu-
+    time-notifications => usr/share/byobu/tests/byobu-time-
+    notifications.in:
+    - use @prefix@ rather than hardcoding /usr, makes code
+      more portable and easier to build with ./config --prefix
+
   [ Arminius Silvanus ]
   * usr/share/byobu/profiles/bashrc: LP: #1280550
     - test the $BASH variable, rather than $SHELL, to tell if we're
diff --git a/etc/profile.d/Z97-byobu.sh b/etc/profile.d/Z97-byobu.sh.in
similarity index 71%
rename from etc/profile.d/Z97-byobu.sh
rename to etc/profile.d/Z97-byobu.sh.in
index aab65e80..78a45035 100755
--- a/etc/profile.d/Z97-byobu.sh
+++ b/etc/profile.d/Z97-byobu.sh.in
@@ -20,16 +20,16 @@
 # Apologies for borrowing the LC_BYOBU namespace, but:
 #  a) it's reasonable to assume that no one else is using LC_BYOBU
 #  b) LC_* is sent and receieved by most /etc/ssh/ssh*_config
-if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "/usr/bin/byobu-launch" ]; then
-	. /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "/usr/bin/byobu-launch" ]; then
-	. /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "/usr/bin/byobu-launch" ]; then
+if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then
+	. @prefix@/bin/byobu-launch
+elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
+	. @prefix@/bin/byobu-launch
+elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
 	export BYOBU_BACKEND="screen"
-	. /usr/bin/byobu-launch
-elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "/usr/bin/byobu-launch" ]; then
+	. @prefix@/bin/byobu-launch
+elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then
 	export BYOBU_BACKEND="tmux"
-	. /usr/bin/byobu-launch
+	. @prefix@/bin/byobu-launch
 fi
 
 # vi: syntax=sh ts=4 noexpandtab
diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config.in
similarity index 91%
rename from usr/bin/byobu-config
rename to usr/bin/byobu-config.in
index 9fd810f2..7fd31799 100755
--- a/usr/bin/byobu-config
+++ b/usr/bin/byobu-config.in
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py"
diff --git a/usr/bin/byobu-ctrl-a b/usr/bin/byobu-ctrl-a.in
similarity index 98%
rename from usr/bin/byobu-ctrl-a
rename to usr/bin/byobu-ctrl-a.in
index 883bc2b0..df75564c 100755
--- a/usr/bin/byobu-ctrl-a
+++ b/usr/bin/byobu-ctrl-a.in
@@ -27,7 +27,7 @@ EOF
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 bind_to=""
diff --git a/usr/bin/byobu-disable-prompt b/usr/bin/byobu-disable-prompt.in
similarity index 93%
rename from usr/bin/byobu-disable-prompt
rename to usr/bin/byobu-disable-prompt.in
index 47912241..6f3d7d9f 100755
--- a/usr/bin/byobu-disable-prompt
+++ b/usr/bin/byobu-disable-prompt.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 $BYOBU_SED -i -e "/#byobu-prompt#$/d" "$HOME/.bashrc"
diff --git a/usr/bin/byobu-disable b/usr/bin/byobu-disable.in
similarity index 93%
rename from usr/bin/byobu-disable
rename to usr/bin/byobu-disable.in
index ce96f4e7..7c115abe 100755
--- a/usr/bin/byobu-disable
+++ b/usr/bin/byobu-disable.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-uninstall
diff --git a/usr/bin/byobu-enable-prompt b/usr/bin/byobu-enable-prompt.in
similarity index 94%
rename from usr/bin/byobu-enable-prompt
rename to usr/bin/byobu-enable-prompt.in
index 06382cd3..2ff99fd8 100755
--- a/usr/bin/byobu-enable-prompt
+++ b/usr/bin/byobu-enable-prompt.in
@@ -21,7 +21,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 
diff --git a/usr/bin/byobu-enable b/usr/bin/byobu-enable.in
similarity index 93%
rename from usr/bin/byobu-enable
rename to usr/bin/byobu-enable.in
index ead1c361..1d3deb95 100755
--- a/usr/bin/byobu-enable
+++ b/usr/bin/byobu-enable.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-install
diff --git a/usr/bin/byobu-export b/usr/bin/byobu-export.in
similarity index 93%
rename from usr/bin/byobu-export
rename to usr/bin/byobu-export.in
index a89e52a7..28fff3c0 100755
--- a/usr/bin/byobu-export
+++ b/usr/bin/byobu-export.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 gettext "
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor.in
similarity index 98%
rename from usr/bin/byobu-janitor
rename to usr/bin/byobu-janitor.in
index c7f244a3..071d0955 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor.in
@@ -21,7 +21,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Ensure that all updates get run immediately
diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch.in
similarity index 97%
rename from usr/bin/byobu-launch
rename to usr/bin/byobu-launch.in
index 1dda80f2..1ea36b6b 100755
--- a/usr/bin/byobu-launch
+++ b/usr/bin/byobu-launch.in
@@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
 	BYOBU_SOURCED_PROFILE=1
 	PKG="byobu"
 	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	# Ensure that autolaunch is not explicitly disabled
 	if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install.in
similarity index 96%
rename from usr/bin/byobu-launcher-install
rename to usr/bin/byobu-launcher-install.in
index 78202a26..443c0870 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install.in
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach"
diff --git a/usr/bin/byobu-launcher-uninstall b/usr/bin/byobu-launcher-uninstall.in
similarity index 94%
rename from usr/bin/byobu-launcher-uninstall
rename to usr/bin/byobu-launcher-uninstall.in
index 9f4b2216..049e4706 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall.in
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 remove_launcher() {
diff --git a/usr/bin/byobu-launcher b/usr/bin/byobu-launcher.in
similarity index 94%
rename from usr/bin/byobu-launcher
rename to usr/bin/byobu-launcher.in
index 45f95e5b..5868b619 100755
--- a/usr/bin/byobu-launcher
+++ b/usr/bin/byobu-launcher.in
@@ -22,7 +22,7 @@ PKG="byobu"
 # ie, rather than "sudo byobu", you must run "sudo -H byobu"
 if [ -O "$HOME" ]; then
 	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
 		false
diff --git a/usr/bin/byobu-layout b/usr/bin/byobu-layout.in
similarity index 97%
rename from usr/bin/byobu-layout
rename to usr/bin/byobu-layout.in
index ee0ab61e..8c1a2f9e 100755
--- a/usr/bin/byobu-layout
+++ b/usr/bin/byobu-layout.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Get the layouts directory
diff --git a/usr/bin/byobu-prompt b/usr/bin/byobu-prompt.in
similarity index 92%
rename from usr/bin/byobu-prompt
rename to usr/bin/byobu-prompt.in
index 3720be3f..07f7bfe2 100755
--- a/usr/bin/byobu-prompt
+++ b/usr/bin/byobu-prompt.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 echo
diff --git a/usr/bin/byobu-quiet b/usr/bin/byobu-quiet.in
similarity index 94%
rename from usr/bin/byobu-quiet
rename to usr/bin/byobu-quiet.in
index 3c8c77ac..fd5b8b74 100755
--- a/usr/bin/byobu-quiet
+++ b/usr/bin/byobu-quiet.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/status.disable"
diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets.in
similarity index 97%
rename from usr/bin/byobu-reconnect-sockets
rename to usr/bin/byobu-reconnect-sockets.in
index 46f28a58..92c03fed 100755
--- a/usr/bin/byobu-reconnect-sockets
+++ b/usr/bin/byobu-reconnect-sockets.in
@@ -25,7 +25,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 case "$-" in
diff --git a/usr/bin/byobu-select-backend b/usr/bin/byobu-select-backend.in
similarity index 94%
rename from usr/bin/byobu-select-backend
rename to usr/bin/byobu-select-backend.in
index 19298a20..a33569e7 100755
--- a/usr/bin/byobu-select-backend
+++ b/usr/bin/byobu-select-backend.in
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 usage () {
diff --git a/usr/bin/byobu-select-profile b/usr/bin/byobu-select-profile.in
similarity index 98%
rename from usr/bin/byobu-select-profile
rename to usr/bin/byobu-select-profile.in
index 45bb4b1f..b1d6dcce 100755
--- a/usr/bin/byobu-select-profile
+++ b/usr/bin/byobu-select-profile.in
@@ -24,7 +24,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 TEXTDOMAIN="$PKG"
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session.in
similarity index 91%
rename from usr/bin/byobu-select-session
rename to usr/bin/byobu-select-session.in
index 34bc552f..0ba9beb7 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session.in
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/select-session.py"
diff --git a/usr/bin/byobu-shell b/usr/bin/byobu-shell.in
similarity index 94%
rename from usr/bin/byobu-shell
rename to usr/bin/byobu-shell.in
index a56b6327..97bdccce 100755
--- a/usr/bin/byobu-shell
+++ b/usr/bin/byobu-shell.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"
diff --git a/usr/bin/byobu-silent b/usr/bin/byobu-silent.in
similarity index 93%
rename from usr/bin/byobu-silent
rename to usr/bin/byobu-silent.in
index 3caf124e..973e6c3b 100755
--- a/usr/bin/byobu-silent
+++ b/usr/bin/byobu-silent.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/status.disable"
diff --git a/usr/bin/byobu-status-detail b/usr/bin/byobu-status-detail.in
similarity index 93%
rename from usr/bin/byobu-status-detail
rename to usr/bin/byobu-status-detail.in
index 5582d600..7cbde5f7 100755
--- a/usr/bin/byobu-status-detail
+++ b/usr/bin/byobu-status-detail.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 if which vim >/dev/null && `vim --version | grep -q +folding`; then
diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status.in
similarity index 98%
rename from usr/bin/byobu-status
rename to usr/bin/byobu-status.in
index c4684aa8..c8b9e33a 100755
--- a/usr/bin/byobu-status
+++ b/usr/bin/byobu-status.in
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Make sure status is not disabled
diff --git a/usr/bin/byobu-ugraph b/usr/bin/byobu-ugraph.in
similarity index 96%
rename from usr/bin/byobu-ugraph
rename to usr/bin/byobu-ugraph.in
index bf33f349..d4c6feaa 100755
--- a/usr/bin/byobu-ugraph
+++ b/usr/bin/byobu-ugraph.in
@@ -26,7 +26,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 script_name=${0##*/}
@@ -81,7 +81,7 @@ Examples:
   Trailing echo adds a required newline
   Note no filename specified.
 
-    $script_name "(/usr/lib/byobu/mem_used | sed -e 's/% //g';echo)"
+    $script_name "(@prefix@/lib/byobu/mem_used | sed -e 's/% //g';echo)"
 
 
   Using $script_name just to rotate log and display the graph
diff --git a/usr/bin/byobu-ulevel b/usr/bin/byobu-ulevel.in
similarity index 99%
rename from usr/bin/byobu-ulevel
rename to usr/bin/byobu-ulevel.in
index 877de325..b648bf0f 100755
--- a/usr/bin/byobu-ulevel
+++ b/usr/bin/byobu-ulevel.in
@@ -37,7 +37,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 circles_2=(○ ●)
diff --git a/usr/bin/byobu b/usr/bin/byobu.in
similarity index 98%
rename from usr/bin/byobu
rename to usr/bin/byobu.in
index a055105c..a2ed023e 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu.in
@@ -41,14 +41,14 @@ if [ -z "${BYOBU_PREFIX}" ]; then
 	# Find and export the installation location prefix
 	greadlink -f . >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
 	prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))"
-	if [ "$prefix" != "/usr" ]; then
+	if [ "$prefix" != "@prefix@" ]; then
 		echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"
 		. "$HOME/.byoburc"
 	fi
 fi
 export BYOBU_CHARMAP=$(locale charmap)
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Override backend if we can determine intentions from argv[0]
diff --git a/usr/lib/byobu/include/config.py b/usr/lib/byobu/include/config.py.in
similarity index 99%
rename from usr/lib/byobu/include/config.py
rename to usr/lib/byobu/include/config.py.in
index 73d75b46..11fc00cb 100755
--- a/usr/lib/byobu/include/config.py
+++ b/usr/lib/byobu/include/config.py.in
@@ -52,7 +52,7 @@ BYOBU_CONFIG_DIR = os.getenv("BYOBU_CONFIG_DIR", HOME + "/.byobu")
 BYOBU_RUN_DIR = os.getenv("BYOBU_RUN_DIR", HOME + "/.cache/byobu")
 BYOBU_BACKEND = os.getenv("BYOBU_BACKEND", "tmux")
 BYOBU_SOCKETDIR = os.getenv("SOCKETDIR", "/var/run/screen")
-BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "/usr")
+BYOBU_PREFIX = os.getenv("BYOBU_PREFIX", "@prefix@")
 SHARE = BYOBU_PREFIX + '/share/' + PKG
 DOC = BYOBU_PREFIX + '/share/doc/' + PKG
 if not os.path.exists(SHARE):
diff --git a/usr/lib/byobu/include/dirs b/usr/lib/byobu/include/dirs.in
similarity index 98%
rename from usr/lib/byobu/include/dirs
rename to usr/lib/byobu/include/dirs.in
index cfb67d86..88e13f4c 100755
--- a/usr/lib/byobu/include/dirs
+++ b/usr/lib/byobu/include/dirs.in
@@ -22,7 +22,7 @@ PKG="byobu"
 
 # Some users build and install byobu themselves, rather than from a distro
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr"
+[ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@"
 
 # Create and export the user configuration directory
 if [ -d "$BYOBU_CONFIG_DIR" ]; then
diff --git a/usr/lib/byobu/include/toggle-utf8 b/usr/lib/byobu/include/toggle-utf8.in
similarity index 95%
rename from usr/lib/byobu/include/toggle-utf8
rename to usr/lib/byobu/include/toggle-utf8.in
index 84fcf500..e441711c 100755
--- a/usr/lib/byobu/include/toggle-utf8
+++ b/usr/lib/byobu/include/toggle-utf8.in
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 [ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc"
 
diff --git a/usr/share/byobu/tests/byobu-time-notifications b/usr/share/byobu/tests/byobu-time-notifications.in
similarity index 96%
rename from usr/share/byobu/tests/byobu-time-notifications
rename to usr/share/byobu/tests/byobu-time-notifications.in
index 820f90c0..1602450c 100755
--- a/usr/share/byobu/tests/byobu-time-notifications
+++ b/usr/share/byobu/tests/byobu-time-notifications.in
@@ -21,7 +21,7 @@
 
 PKG=byobu
 RUNS=100
-[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="/usr"
+[ -z "$BYOBU_PREFIX" ] && BYOBU_PREFIX="@prefix@"
 export BYOBU_PREFIX
 
 loop() {