diff --git a/debian/changelog b/debian/changelog
index 8579e18f..939f3868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
+livecd-rootfs (2.383) xenial; urgency=medium
+
+  * add snap cration for ubuntu-core snappy rootfs builds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 08 Mar 2016 16:43:45 +0100
+
 livecd-rootfs (2.382) xenial; urgency=medium
 
   * Remove the manta device from the list of touchsubarches as we're not
-    building its kernel anymore (LP: #1553069).
+    building its kernel anymore.
 
  -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 04 Mar 2016 09:47:31 +0100
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 5066c4bb..bc72181a 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -319,6 +319,32 @@ elif [ -e binary-tar.tar.gz ]; then
 	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 meta; do
+            mkdir -p $rootfs/$dir
+        done
+
+        VERSION="$(lsb_release -r -s)-$(date +20%y%m%d-%H-%M)"
+
+        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"