diff --git a/debian/changelog b/debian/changelog
index 30e9f2cb..c2c1cd52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,24 @@ byobu (4.47) unreleased; urgency=low
     usr/share/byobu/keybindings/f-keys.tmux:
     - set a BYOBU_PAGER environment variable
     - use BYOBU_PAGER in places we need a pager
+  * === added directory usr/lib/byobu/include, experimental/byobu-
+    classroom, usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-
+    disable, usr/bin/byobu-enable, 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-quiet, usr/bin/byobu-reconnect-sockets, usr/bin/byobu-
+    select-backend, usr/bin/byobu-select-profile, 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/.common => usr/lib/byobu/include/common (properties
+    changed: -x to +x), usr/lib/byobu/.constants =>
+    usr/lib/byobu/include/constants, usr/lib/byobu/.dirs =>
+    usr/lib/byobu/include/dirs, usr/lib/byobu/Makefile.am,
+    usr/lib/byobu/notify_osd, usr/lib/byobu/.notify_osd =>
+    usr/lib/byobu/include/notify_osd, usr/lib/byobu/.shutil =>
+    usr/lib/byobu/include/shutil: LP: #833768
+    - move dotfiles out of usr/lib/byobu and into usr/lib/byobu/include
+    - this was triggering some chrootkit warnings
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 08 Nov 2011 19:16:15 -0600
 
diff --git a/experimental/byobu-classroom b/experimental/byobu-classroom
index 2ca9a59f..60b31d65 100755
--- a/experimental/byobu-classroom
+++ b/experimental/byobu-classroom
@@ -22,7 +22,7 @@
 
 PKG="byobu"
 
-. "/usr/lib/$PKG/.shutil"
+. "/usr/lib/$PKG/include/shutil"
 
 usage() {
 	echo
@@ -98,8 +98,6 @@ while [ $(stat -c%a "$screen") != "6755" ]; do
 	case "$c" in
 		y|Y)
 			dpkg-statoverride --add root root 6755 "$screen"
-			chmod 6755 "$screen"
-			chmod 755 /var/run/screen
 			info "Updated $screen"
 			echo
 			info "To revert this later, run:"
diff --git a/usr/bin/byobu b/usr/bin/byobu
index 49b7288c..f9ee7612 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -38,7 +38,7 @@ case "$0" in
 esac
 
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # At this point, we're sure BYOBU_BACKEND is properly defined
 export BYOBU_BACKEND
diff --git a/usr/bin/byobu-ctrl-a b/usr/bin/byobu-ctrl-a
index 86654d9e..b69525d6 100755
--- a/usr/bin/byobu-ctrl-a
+++ b/usr/bin/byobu-ctrl-a
@@ -27,7 +27,7 @@ EOF
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 bind_to=""
 keybindings="$BYOBU_CONFIG_DIR/keybindings"
diff --git a/usr/bin/byobu-disable b/usr/bin/byobu-disable
index df2537ec..f00dfade 100755
--- a/usr/bin/byobu-disable
+++ b/usr/bin/byobu-disable
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-uninstall
 
diff --git a/usr/bin/byobu-enable b/usr/bin/byobu-enable
index 9b2b9f38..a66c480a 100755
--- a/usr/bin/byobu-enable
+++ b/usr/bin/byobu-enable
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-install
 
diff --git a/usr/bin/byobu-export b/usr/bin/byobu-export
index 5c7ef0e3..5efee614 100755
--- a/usr/bin/byobu-export
+++ b/usr/bin/byobu-export
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 gettext "
 The byobu-export utility is now deprecated.
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index d689da9c..d6761ed8 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -21,7 +21,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Ensure that all updates get run immediately
 rm -rf "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND"
diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch
index 1302e736..569a7fd6 100755
--- a/usr/bin/byobu-launch
+++ b/usr/bin/byobu-launch
@@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
 	BYOBU_SOURCED_PROFILE=1
 	PKG="byobu"
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-	. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	# Ensure that autolaunch is not explicitly disabled
 	if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
 		case "$-" in
diff --git a/usr/bin/byobu-launcher b/usr/bin/byobu-launcher
index 25416c75..52df8baa 100755
--- a/usr/bin/byobu-launcher
+++ b/usr/bin/byobu-launcher
@@ -22,7 +22,7 @@ PKG="byobu"
 # ie, rather than "sudo byobu", you must run "sudo -H byobu"
 if [ -O "$HOME" ]; then
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-	. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
 		false
 	else
diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install
index 3702d6cb..a129fe58 100755
--- a/usr/bin/byobu-launcher-install
+++ b/usr/bin/byobu-launcher-install
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${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
index b573bf44..24be96f6 100755
--- a/usr/bin/byobu-launcher-uninstall
+++ b/usr/bin/byobu-launcher-uninstall
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 remove_launcher() {
 	dest=$1
diff --git a/usr/bin/byobu-quiet b/usr/bin/byobu-quiet
index 6e281711..d3e8c170 100755
--- a/usr/bin/byobu-quiet
+++ b/usr/bin/byobu-quiet
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${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
index d74986b4..8abf2aa7 100755
--- a/usr/bin/byobu-reconnect-sockets
+++ b/usr/bin/byobu-reconnect-sockets
@@ -23,7 +23,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 case "$-" in
 	*i*)
diff --git a/usr/bin/byobu-select-backend b/usr/bin/byobu-select-backend
index 970d507c..a06e50fa 100755
--- a/usr/bin/byobu-select-backend
+++ b/usr/bin/byobu-select-backend
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 usage () {
 	cat <<EOT
diff --git a/usr/bin/byobu-select-profile b/usr/bin/byobu-select-profile
index 8025b405..053a50ed 100755
--- a/usr/bin/byobu-select-profile
+++ b/usr/bin/byobu-select-profile
@@ -24,7 +24,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 TEXTDOMAIN="$PKG"
 
diff --git a/usr/bin/byobu-shell b/usr/bin/byobu-shell
index 25afa3e4..a3e5bae0 100755
--- a/usr/bin/byobu-shell
+++ b/usr/bin/byobu-shell
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"
 
diff --git a/usr/bin/byobu-silent b/usr/bin/byobu-silent
index 60430596..fadbe355 100755
--- a/usr/bin/byobu-silent
+++ b/usr/bin/byobu-silent
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/status.disable"
 
diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status
index 390bc8ef..8440350d 100755
--- a/usr/bin/byobu-status
+++ b/usr/bin/byobu-status
@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Make sure status is not disabled
 [ -f "$BYOBU_CONFIG_DIR/status.disable" ] && exit 0
diff --git a/usr/bin/byobu-status-detail b/usr/bin/byobu-status-detail
index 1ee61fbf..87eef511 100755
--- a/usr/bin/byobu-status-detail
+++ b/usr/bin/byobu-status-detail
@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 if which vim >/dev/null && `vim --version | grep -q +folding`; then
 	byobu-status --detail | vim -c "set foldmethod=indent" -c "set foldminlines=0" -c "set foldnestmax=1"  -c "set foldcolumn=2" -R -
diff --git a/usr/bin/byobu-ugraph b/usr/bin/byobu-ugraph
index be567be8..13dab3ab 100755
--- a/usr/bin/byobu-ugraph
+++ b/usr/bin/byobu-ugraph
@@ -26,7 +26,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 script_name=${0##*/}
 min_default=0
diff --git a/usr/bin/byobu-ulevel b/usr/bin/byobu-ulevel
index 4507180d..bd68fc95 100755
--- a/usr/bin/byobu-ulevel
+++ b/usr/bin/byobu-ulevel
@@ -37,7 +37,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 circles_2=(○ ●)
 diamonds_2=(◇ ◆)
diff --git a/usr/lib/byobu/Makefile.am b/usr/lib/byobu/Makefile.am
index 4e789ac3..ac4580c2 100644
--- a/usr/lib/byobu/Makefile.am
+++ b/usr/lib/byobu/Makefile.am
@@ -1,3 +1,3 @@
 libdirdir = $(prefix)/lib/@PACKAGE@
-libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  color  custom  date  disk  disk_io  distro ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  memory  menu  network  .notify_osd  notify_osd  processes  raid  rcs_cost  reboot_required  release  services  swap  time  time_binary time_utc trash updates_available  uptime  users  whoami  wifi_quality .common .constants .dirs .shutil
+libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  color  custom  date  disk  disk_io  distro ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  memory  menu  network  processes  raid  rcs_cost  reboot_required  release  services  swap  time  time_binary time_utc trash updates_available  uptime  users  whoami  wifi_quality
 
diff --git a/usr/lib/byobu/.common b/usr/lib/byobu/include/common
old mode 100644
new mode 100755
similarity index 87%
rename from usr/lib/byobu/.common
rename to usr/lib/byobu/include/common
index 3378e164..82e320cb
--- a/usr/lib/byobu/.common
+++ b/usr/lib/byobu/include/common
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .common: common stuff sourced by all scripts
+#    common: common stuff sourced by all scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
@@ -20,7 +20,7 @@
 
 if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 	# Needed to set up $BYOBU_CONFIG_DIR
-	. "${BYOBU_PREFIX}/lib/${PKG}/.dirs"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/dirs"
 
 	# If the backend is already set (eg. running `byobu-tmux`), do nothing.
 	if [ -z "${BYOBU_BACKEND}" ]; then
@@ -33,7 +33,7 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 	# Creating backend cache
 	[ -d "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND"
 
-	. "${BYOBU_PREFIX}/lib/${PKG}/.shutil"
-	. "${BYOBU_PREFIX}/lib/${PKG}/.constants"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/shutil"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/constants"
 	BYOBU_INCLUDED_LIBS=1
 fi
diff --git a/usr/lib/byobu/.constants b/usr/lib/byobu/include/constants
similarity index 96%
rename from usr/lib/byobu/.constants
rename to usr/lib/byobu/include/constants
index 0041cf87..26fa2e04 100755
--- a/usr/lib/byobu/.constants
+++ b/usr/lib/byobu/include/constants
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .constants: some constant values needed by all library status scripts
+#    constants: some constant values needed by all library status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
diff --git a/usr/lib/byobu/.dirs b/usr/lib/byobu/include/dirs
similarity index 97%
rename from usr/lib/byobu/.dirs
rename to usr/lib/byobu/include/dirs
index 6726a3a9..37879a44 100755
--- a/usr/lib/byobu/.dirs
+++ b/usr/lib/byobu/include/dirs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .dirs: some dirs needed by all library status scripts
+#    dirs: some dirs needed by all library status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
diff --git a/usr/lib/byobu/.notify_osd b/usr/lib/byobu/include/notify_osd
similarity index 95%
rename from usr/lib/byobu/.notify_osd
rename to usr/lib/byobu/include/notify_osd
index 24e2f1a9..9532df10 100755
--- a/usr/lib/byobu/.notify_osd
+++ b/usr/lib/byobu/include/notify_osd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#    .notify_osd: perform some string manipulation on notify-osd messages
+#    notify_osd: perform some string manipulation on notify-osd messages
 #                 and then send to the screen message window
 #    Copyright (C) 2010 Canonical Ltd.
 #
diff --git a/usr/lib/byobu/.shutil b/usr/lib/byobu/include/shutil
similarity index 99%
rename from usr/lib/byobu/.shutil
rename to usr/lib/byobu/include/shutil
index a7c04478..799f13cc 100755
--- a/usr/lib/byobu/.shutil
+++ b/usr/lib/byobu/include/shutil
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .shutil: some shared utilities used by all status scripts
+#    shutil: some shared utilities used by all status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
diff --git a/usr/lib/byobu/notify_osd b/usr/lib/byobu/notify_osd
index a76e65f0..a7849fa9 100755
--- a/usr/lib/byobu/notify_osd
+++ b/usr/lib/byobu/notify_osd
@@ -31,7 +31,7 @@ __notify_osd() {
 	# processing new messages and sending them to the session
 	CMD="tail --pid $PPID -n 0 -F $NOTIFY_OSD_LOG"
 	pkill -f "$CMD" || true
-	$CMD | $BYOBU_PREFIX/lib/byobu/.notify_osd "$PPID" &
+	$CMD | $BYOBU_PREFIX/lib/byobu/include/notify_osd "$PPID" &
 }
 
 # vi: syntax=sh ts=4 noexpandtab