diff --git a/Makefile.am b/Makefile.am
index fe691e5c..684bc285 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = etc/byobu \
-	etc/update-motd.d \
 	usr/share/applications \
 	usr/share/byobu/ec2 \
 	usr/share/byobu/keybindings \
diff --git a/configure.ac b/configure.ac
index 3e498949..ced18bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ AM_INIT_AUTOMAKE(byobu, 3.0)
 
 AC_OUTPUT(Makefile \
 	etc/byobu/Makefile \
-	etc/update-motd.d/Makefile \
 	usr/share/applications/Makefile \
 	usr/share/byobu/ec2/Makefile \
 	usr/share/byobu/keybindings/Makefile \
diff --git a/debian/install b/debian/install
index 4f0ff406..2c115287 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
 /usr
+../../etc/update-motd.d/55-window-manager etc/update-motd.d
 ../../etc/byobu/socketdir etc/byobu/
 ../../etc/byobu/statusrc etc/byobu/
 ../../debian/source_byobu.py usr/share/apport/package-hooks
diff --git a/etc/update-motd.d/Makefile.am b/etc/update-motd.d/Makefile.am
deleted file mode 100644
index c71bebe7..00000000
--- a/etc/update-motd.d/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-etcdir = $(datadir)/update-motd.d
-etc_DATA = 55-window-manager
diff --git a/usr/bin/Makefile.am b/usr/bin/Makefile.am
index b6726525..3d3d2c44 100644
--- a/usr/bin/Makefile.am
+++ b/usr/bin/Makefile.am
@@ -1,2 +1,2 @@
-bin_SCRIPTS = byobu  byobu-config  byobu-export  byobu-janitor  byobu-launch  byobu-launcher  byobu-launcher-install  byobu-launcher-uninstall  byobu-reconnect-sockets  byobu-select-profile  byobu-select-session  byobu-status  byobu-status-detail  shell
+bin_SCRIPTS = byobu  byobu-config  byobu-disable  byobu-enable  byobu-export  byobu-janitor  byobu-launch  byobu-launcher  byobu-launcher-install  byobu-launcher-uninstall  byobu-reconnect-sockets  byobu-select-profile  byobu-select-session  byobu-status  byobu-status-detail  shell
 
diff --git a/usr/bin/byobu-disable b/usr/bin/byobu-disable
index 4a785137..ba653963 100755
--- a/usr/bin/byobu-disable
+++ b/usr/bin/byobu-disable
@@ -25,5 +25,3 @@ echo
 echo "To re-enable this behavior later, just run:"
 echo "  byobu-enable"
 echo
-echo -n "Press <enter> to continue..."
-$(head -n1)
diff --git a/usr/bin/shell b/usr/bin/shell
index ff86545c..424692f1 100755
--- a/usr/bin/shell
+++ b/usr/bin/shell
@@ -17,5 +17,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -r /etc/motd ] && cat /etc/motd
+if [ -r /etc/motd ]; then
+	# Prune the byobu advert, if you're already running within byobu
+	grep -v "^For a superior command line experience, enable our text-based window manger" /etc/motd | grep -v "^  byobu-enable"
+fi
 [ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh