diff -Nru live-build-3.0~a57/debian/changelog live-build-3.0~a57/debian/changelog
--- live-build-3.0~a57/debian/changelog	2015-07-22 17:30:17.000000000 +0200
+++ live-build-3.0~a57/debian/changelog	2015-08-05 15:16:32.000000000 +0200
@@ -1,3 +1,12 @@
+live-build (3.0~a57-1ubuntu21) wily; urgency=medium
+
+  * Remove debian/patches/ubuntu-remove-non-release-lists.patch:
+    - We need the apt lists for -security and -updates for bug reports
+  * debian/patches/ubuntu-remove-proposed-lists.patch:
+    - Modified patch above to only remove the proposed apt lists
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Wed, 05 Aug 2015 15:10:53 +0200
+
 live-build (3.0~a57-1ubuntu20) wily; urgency=medium
 
   * debian/patches/upstart-not-in-bootstrap: Rewrite the old user-sessions
diff -Nru live-build-3.0~a57/debian/patches/series live-build-3.0~a57/debian/patches/series
--- live-build-3.0~a57/debian/patches/series	2015-07-22 17:29:49.000000000 +0200
+++ live-build-3.0~a57/debian/patches/series	2015-08-05 15:05:31.000000000 +0200
@@ -7,7 +7,6 @@
 ubuntu-powerpc-smp.patch
 ubuntu-kernel-img-conf.patch
 ubuntu-chroot_headers_tidy.patch
-ubuntu-remove-non-release-lists.patch
 ubuntu-package-lists-without-chroot.patch
 ubuntu-fix-hooks.patch
 ubuntu-parent-mirror-binary-volatile.patch
@@ -31,3 +30,4 @@
 dpkg-divert-initctl
 dpkg-divert-others
 upstart-not-in-bootstrap
+ubuntu-remove-proposed-lists.patch
diff -Nru live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch
--- live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch	2012-08-20 18:21:06.000000000 +0200
+++ live-build-3.0~a57/debian/patches/ubuntu-remove-non-release-lists.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-Description: Always remove apt lists for pockets other than the release one
- The installer doesn't need non-release pocket lists and these are taking
- up quite a bit of space on the media.
- .
- These other pockets changing quite frequently, they will usually have to
- be re-downloaded by the time the system is installed anyway.
-Author: Stéphane Graber <stgraber@ubuntu.com>
-Origin: vendor
-Last-Update: 2012-08-20
-
-Index: b/scripts/build/lb_chroot_archives
-===================================================================
---- a/scripts/build/lb_chroot_archives
-+++ b/scripts/build/lb_chroot_archives
-@@ -881,6 +881,14 @@
- 			mkdir -p chroot/var/lib/apt/lists/partial
- 		fi
- 
-+		# Remove non-release pocket lists on Ubuntu
-+		if [ "${LB_MODE}" = "ubuntu" ]
-+		then
-+			rm -f chroot/var/lib/apt/lists/*-updates_*
-+			rm -f chroot/var/lib/apt/lists/*-security_*
-+			rm -f chroot/var/lib/apt/lists/*-proposed_*
-+		fi
-+
- 		# Remove local package repository
- 		rm -f chroot/etc/apt/sources.list.d/packages.list
- 		rm -rf chroot/root/packages
diff -Nru live-build-3.0~a57/debian/patches/ubuntu-remove-proposed-lists.patch live-build-3.0~a57/debian/patches/ubuntu-remove-proposed-lists.patch
--- live-build-3.0~a57/debian/patches/ubuntu-remove-proposed-lists.patch	1970-01-01 01:00:00.000000000 +0100
+++ live-build-3.0~a57/debian/patches/ubuntu-remove-proposed-lists.patch	2015-08-05 15:10:48.000000000 +0200
@@ -0,0 +1,26 @@
+Description: Always remove apt lists for the proposed pocket
+ The generated images never need the proposed pkg lists in it. -security and
+ -updates are still needed as otherwise we are not able to properly fetch
+ bug-reports from read-only systems that have packages installed from those
+ repositories.
+Author: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>
+Origin: vendor
+Last-Update: 2015-08-05
+
+Index: live-build-3.0~a57/scripts/build/lb_chroot_archives
+===================================================================
+--- live-build-3.0~a57.orig/scripts/build/lb_chroot_archives
++++ live-build-3.0~a57/scripts/build/lb_chroot_archives
+@@ -881,6 +881,12 @@ EOF
+ 			mkdir -p chroot/var/lib/apt/lists/partial
+ 		fi
+ 
++		# Remove proposed pocket lists on Ubuntu
++		if [ "${LB_MODE}" = "ubuntu" ]
++		then
++			rm -f chroot/var/lib/apt/lists/*-proposed_*
++		fi
++
+ 		# Remove local package repository
+ 		rm -f chroot/etc/apt/sources.list.d/packages.list
+ 		rm -rf chroot/root/packages