diff --git a/debian/changelog b/debian/changelog
index 71ef9ad3..4ca0ee73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ byobu (5.95) unreleased; urgency=medium
     - ensure we start tmux with unicode support, LP: #1268072
   * usr/bin/byobu.in, usr/share/man/man1/byobu.1: LP: #1483394
     - byobu -h|--help enters manpage
+  * usr/bin/byobu-shell.in: LP: #1458941
+    - find the motd
 
   [ Fortunato Ventre ]
   * usr/lib/byobu/include/constants:
diff --git a/usr/bin/byobu-shell.in b/usr/bin/byobu-shell.in
index 97bdccce..b7c18eaf 100755
--- a/usr/bin/byobu-shell.in
+++ b/usr/bin/byobu-shell.in
@@ -24,7 +24,10 @@ PKG="byobu"
 
 FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"
 
-[ -r /etc/motd ] && cat /etc/motd
+# Find a MOTD, seems that they're moving around
+for i in /etc/motd /run/motd.dynamic /run/motd; do
+	[ -r $i ] && cat $i && break
+done
 
 if [ ! -e "$FLAG" ]; then
 	echo