diff --git a/debian/changelog b/debian/changelog
index 0731a43e..fd7b2870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 screen-profiles (1.49) unreleased; urgency=low
 
-  * UNRELEASED
+  * motd+shell: should use exec to run shell, LP: #365115
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 21 Apr 2009 16:46:46 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 22 Apr 2009 21:50:00 -0500
 
 screen-profiles (1.48-0ubuntu1) jaunty; urgency=low
 
diff --git a/motd+shell b/motd+shell
index 6fc640a0..abdfccab 100755
--- a/motd+shell
+++ b/motd+shell
@@ -18,4 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 [ -r /etc/motd ] && cat /etc/motd
-[ -x $SHELL ] && $SHELL || /bin/sh
+[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh