=== modified file 'live-build/auto/build'
--- live-build/auto/build	2016-03-04 08:49:27 +0000
+++ live-build/auto/build	2016-03-08 13:48:02 +0000
@@ -319,6 +319,44 @@
 	cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
 fi
 
+if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
+    if [ -e "binary/$INITFS/filesystem.dir" ]; then
+        rootfs="binary/$INITFS/filesystem.dir"
+
+        for dir in lib/modules lib/firmware writable gadget meta; do
+            mkdir -p $rootfs/$dir
+        done
+
+        VERSION="$(lsb_release -r -s)-$(date +20%y%m%d-%H:%M)"
+
+        # for backwards compatibility
+        cat > $rootfs/meta/package.yaml <<EOF
+name: ubuntu-core
+version: $VERSION
+architecture: $ARCH
+vendor: Canonical
+type: os
+EOF
+        cat > $rootfs/meta/readme.md <<EOF
+The ubuntu-core OS snap
+EOF
+
+        cat > $rootfs/meta/snap.yaml <<EOF
+name: ubuntu-core
+version: $VERSION
+summary: The ubuntu-core OS snap
+architectures: [$ARCH]
+type: os
+EOF
+
+        apt-get -y install ubuntu-snappy-cli
+        snappy build --squashfs $rootfs
+
+        snapfile="$(ls ubuntu-core*.snap)"
+        cp -a $snapfile $PREFIX.$snapfile
+    fi
+fi
+
 if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-pd" ]; then
 	(cd "binary/$INITFS/custom.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"