diff --git a/debian/changelog b/debian/changelog
index 5628c076..b51c6ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.374) UNRELEASED; urgency=medium
+
+  * ubuntu-core:
+    - include the dpkg.list in the device tarball
+    - store /usr/share/snappy/dpkg.list manifest on the OS tarball
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Jan 2016 18:27:23 +0100
+
 livecd-rootfs (2.373) xenial; urgency=medium
 
   * Set timeout options so ppc64el cloud images don't display a grub boot
diff --git a/live-build/auto/build b/live-build/auto/build
index 96f9d766..0adff661 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -395,6 +395,8 @@ case $PROJECT:$SUBPROJECT in
         Chroot chroot "apt-get -y install initramfs-tools-ubuntu-core linux-firmware xz-utils"
         Chroot chroot "apt-get -y install $linux_package"
 
+        Chroot chroot "dpkg -l" > chroot/dpkg.list
+        
         # clean up
         lb chroot_devpts remove "$@"
         lb chroot_sysfs remove "$@"
@@ -436,6 +438,9 @@ case $PROJECT:$SUBPROJECT in
            esac
         fi
 
+        # copy dpkg manifest
+        cp -ar dpkg.list $TMPDIR/
+
         # create hardware.yaml
         # this assumes armhf == u-boot
         # and all others grub
diff --git a/live-build/ubuntu-core/hooks/600-no-debian.binary b/live-build/ubuntu-core/hooks/600-no-debian.binary
index 5b02e5d9..5e16071e 100755
--- a/live-build/ubuntu-core/hooks/600-no-debian.binary
+++ b/live-build/ubuntu-core/hooks/600-no-debian.binary
@@ -8,6 +8,12 @@ echo "I: Removing the debian legacy"
 
 PREFIX=binary/boot/filesystem.dir
 
+# store manifest of all installed packages
+(cd $PREFIX
+ install -m755 -d usr/share/snappy
+ chroot . dpkg -l > usr/share/snappy/dpkg.list
+)
+
 # dpkg-deb and dpkg purposefully left behind
 (cd $PREFIX
     chroot . dpkg --purge apt