diff --git a/debian/changelog b/debian/changelog
index e798bd5a..40cbfe86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livecd-rootfs (2.276) vivid; urgency=medium
+
+  [ Mathieu Trudel-Lapierre ]
+  * live-build/auto/config: add config for Ubuntu MATE.
+
+  [ Michael Vogt ]
+  * use generic kernel for all ubuntu-core system-image
+  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
+    - run chpasswd after user moved into /var/lib/extrausers
+  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
+    - run with -e
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 28 Jan 2015 11:03:08 -0500
+
 livecd-rootfs (2.275+ppa2) vivid; urgency=medium
 
   * live-build/ubuntu-core/hooks/04-configure_network.chroot: use
diff --git a/live-build/auto/config b/live-build/auto/config
index 1d6ae894..1b61f57c 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -149,6 +149,10 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 			add_package live oem-config-gtk ubiquity-frontend-gtk
 			add_package live ubiquity-slideshow-xubuntu
 			;;
+		ubuntu-mate)
+			add_package live oem-config-gtk ubiquity-frontend-gtk
+			add_package live ubiquity-slideshow-ubuntu-mate
+			;;
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
@@ -306,6 +310,18 @@ case $PROJECT in
 		COMPONENTS='main restricted universe'
 		;;
 
+	ubuntu-mate)
+		add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
+		LIVE_TASK='ubuntu-mate-live'
+		case $ARCH in
+			amd64)	add_package live linux-signed-generic ;;
+		esac
+		COMPONENTS='main restricted universe multiverse'
+		# The Ubuntu MATE STRUCTURE file has "feature
+		# no-follow-recommends".  Mirror this.
+		export APT_OPTIONS="--yes --no-install-recommends"
+		;;
+
 	ubuntustudio-dvd)
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
 		COMPONENTS='main restricted universe multiverse'
@@ -367,14 +383,13 @@ case $PROJECT in
                         esac
 
                         # generic kernel etc
+                        KERNEL_FLAVOURS=generic
                         case $ARCH in
 			    i386|amd64)	
 			        add_package install grub-pc
-                                KERNEL_FLAVOURS=virtual
                                 ;;
                             armhf)
                                 add_package install flash-kernel u-boot-tools
-                                KERNEL_FLAVOURS=generic
                                 ;;
                         esac
 		        OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
index c4a35f05..967c6a1b 100755
--- a/live-build/ubuntu-core/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -1,14 +1,13 @@
 #!/bin/sh -x
 
+set -e
+
 USER=ubuntu
 UGID=1000
 
 echo "I: creating default user $USER"
 adduser --gecos $USER --disabled-login $USER --uid $UGID
 
-echo "I: set user $USER password to $USER"
-echo "$USER:$USER" | chpasswd
-
 chown -R $UGID:$UGID /home/$USER
 
 # Enable libnss-extrusers
@@ -31,3 +30,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+
+# needs to run *after* the user was moved out to /var/lib/extrausers
+echo "I: set user $USER password to $USER"
+echo "$USER:$USER" | chpasswd
+