diff --git a/debian/changelog b/debian/changelog
index 102da40e..5d5de20d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.525.10ubuntu1) UNRELEASED; urgency=medium
+
+  * Include snaps in image manifests
+
+ -- Cody Shepherd <cody.shepherd@canonical.com>  Tue, 27 Nov 2018 11:16:13 -0800
+
 livecd-rootfs (2.525.10) bionic; urgency=medium
 
   [ Cody Shepherd ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 110478a5..86de899a 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -503,6 +503,7 @@ fi
 
 # '--initramfs none' produces different manifest names.
 if [ -e "binary/$INITFS/filesystem.packages" ]; then
+    ./config/snap-seed-parse "chroot/" "binary/${INITFS}/filesystem.packages"
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
 	chmod 644 "$PREFIX.manifest"
 fi
diff --git a/live-build/auto/config b/live-build/auto/config
index ba554125..366c4c38 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -33,6 +33,7 @@ fi
 
 mkdir -p config
 cp -af /usr/share/livecd-rootfs/live-build/functions config/functions
+cp -af /usr/share/livecd-rootfs/live-build/snap-seed-parse.py config/snap-seed-parse
 
 mkdir -p config/package-lists
 
diff --git a/live-build/functions b/live-build/functions
index 3363bf2a..a06427d3 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -43,6 +43,17 @@ create_empty_disk_image() {
     dd if=/dev/zero of="$1" bs=1 count=0 seek="${imagesize}"
 }
 
+create_manifest() {
+    local chroot_root=${1}
+    local target_file=${2}
+    echo "create_manifest chroot_root: ${chroot_root}"
+    dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file}
+    echo "create_manifest call to dpkg-query finished."
+    ./config/snap-seed-parse "${chroot_root}" "${target_file}"
+    echo "create_manifest call to snap_seed_parse finished."
+    echo "create_manifest finished"
+}
+
 make_ext4_partition() {
     device="$1"
     label=${fs_label:+-L "${fs_label}"}
diff --git a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary
index a4d77bd7..6ba4fe9c 100644
--- a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary
+++ b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary
@@ -26,4 +26,4 @@ mkdir -p $rootfs_dir/lib/modules
 
 teardown_mountpoint $rootfs_dir
 
-dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest
+create_manifest "${rootfs_dir}" "${rootfs_dir}.manifest"
diff --git a/live-build/ubuntu-server/hooks/030-root-squashfs.binary b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
index ad34e76a..41c15001 100755
--- a/live-build/ubuntu-server/hooks/030-root-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/030-root-squashfs.binary
@@ -28,7 +28,7 @@ cp -a chroot/* binary/boot/squashfs.dir
 squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 
-dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest}
+create_manifest "binary/boot/squashfs.dir" "${squashfs_f_manifest}"
 
 (cd "binary/boot/squashfs.dir/" &&
       mksquashfs . ${squashfs_f} \