diff --git a/debian/changelog b/debian/changelog
index 218a340f..e6d60a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ livecd-rootfs (2.411) UNRELEASED; urgency=medium
   * drop flash-kernel from snappy, it is useless there
   * create /boot/uboot dir on all arches and configure /etc/fw_env.config
     everywhere
+  * adjust motd message on snappy (capitalize "Snappy Ubuntu Core" and replace
+    the "snappy --help" with "snap --help"
 
- -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 May 2016 21:01:34 +0200
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 25 May 2016 14:26:07 +0200
 
 livecd-rootfs (2.410) yakkety; urgency=medium
 
diff --git a/live-build/ubuntu-core/hooks/14-set-motd.chroot b/live-build/ubuntu-core/hooks/14-set-motd.chroot
index 206a57db..cd89d365 100644
--- a/live-build/ubuntu-core/hooks/14-set-motd.chroot
+++ b/live-build/ubuntu-core/hooks/14-set-motd.chroot
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 cat >/etc/motd<<EOF
-Welcome to snappy Ubuntu Core, a transactionally updated Ubuntu.
+Welcome to Snappy Ubuntu Core, a transactionally updated Ubuntu.
 
  * See https://ubuntu.com/snappy
 
-It's a brave new world here in snappy Ubuntu Core! This machine
-does not use apt-get or deb packages. Please see 'snappy --help'
+It's a brave new world here in Snappy Ubuntu Core! This machine
+does not use apt-get or deb packages. Please see 'snap --help'
 for app installation and transactional updates.
 
 EOF