diff -Nru lxd-2.0.3/debian/changelog lxd-2.0.3/debian/changelog
--- lxd-2.0.3/debian/changelog	2016-06-29 22:29:11.000000000 +0000
+++ lxd-2.0.3/debian/changelog	2016-06-30 17:59:59.000000000 +0000
@@ -1,12 +1,19 @@
-lxd (2.0.3-0ubuntu1~ubuntu14.04.1) trusty-backports; urgency=medium
+lxd (2.0.3-0ubuntu2~ubuntu14.04.1) trusty-backports; urgency=medium
 
-  * Backport to trusty (LP: #1582891)
+  * Backport to trusty
   * Build using golang-1.6-go.
   * Arch-restrict all binaries to amd64, arm64, armhf, i386, ppc64el.
     powerpc isn't supported by golang-go.
   * Use bundled dependencies instead of archive versions (which don't exist).
 
- -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 29 Jun 2016 18:27:30 -0400
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 30 Jun 2016 13:59:34 -0400
+
+lxd (2.0.3-0ubuntu2) yakkety; urgency=medium
+
+  * Cherry-pick squashfs fix from upstream:
+    - simplestreams: list images available as both squashfs and tar.xz
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 30 Jun 2016 13:56:29 -0400
 
 lxd (2.0.3-0ubuntu1) yakkety; urgency=medium
 
diff -Nru lxd-2.0.3/debian/.git-dpm lxd-2.0.3/debian/.git-dpm
--- lxd-2.0.3/debian/.git-dpm	2016-06-29 21:42:12.000000000 +0000
+++ lxd-2.0.3/debian/.git-dpm	2016-06-30 17:56:26.000000000 +0000
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-1a972f53eb42ba88f20419989eea37d39880f424
-1a972f53eb42ba88f20419989eea37d39880f424
+542183c5d462f2cac10d6f0800dd3b6f8d609aff
+542183c5d462f2cac10d6f0800dd3b6f8d609aff
 4830b0edd3db98b0b283fc1d7e7ca773e3260fc5
 4830b0edd3db98b0b283fc1d7e7ca773e3260fc5
 lxd_2.0.3.orig.tar.gz
diff -Nru lxd-2.0.3/debian/patches/0002-simplestreams-list-images-available-as-both-squashfs.patch lxd-2.0.3/debian/patches/0002-simplestreams-list-images-available-as-both-squashfs.patch
--- lxd-2.0.3/debian/patches/0002-simplestreams-list-images-available-as-both-squashfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ lxd-2.0.3/debian/patches/0002-simplestreams-list-images-available-as-both-squashfs.patch	2016-06-30 17:56:26.000000000 +0000
@@ -0,0 +1,26 @@
+From 542183c5d462f2cac10d6f0800dd3b6f8d609aff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Thu, 30 Jun 2016 13:30:28 -0400
+Subject: simplestreams: list images available as both squashfs and tar.xz
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+---
+ shared/simplestreams.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shared/simplestreams.go b/shared/simplestreams.go
+index a3d07c1..973b9bb 100644
+--- a/shared/simplestreams.go
++++ b/shared/simplestreams.go
+@@ -153,7 +153,7 @@ func (s *SimpleStreamsManifest) ToLXD() ([]ImageInfo, map[string][][]string) {
+ 				}
+ 			}
+ 
+-			if found != 2 || size == 0 || filename == "" || fingerprint == "" {
++			if found < 2 || size == 0 || filename == "" || fingerprint == "" {
+ 				// Invalid image
+ 				continue
+ 			}
diff -Nru lxd-2.0.3/debian/patches/series lxd-2.0.3/debian/patches/series
--- lxd-2.0.3/debian/patches/series	2016-06-29 21:42:08.000000000 +0000
+++ lxd-2.0.3/debian/patches/series	2016-06-30 17:56:26.000000000 +0000
@@ -1 +1,2 @@
 0001-init-Allow-running-dpkg-reconfigure.patch
+0002-simplestreams-list-images-available-as-both-squashfs.patch