=== modified file 'Makefile'
--- Makefile	2014-07-22 21:13:21 +0000
+++ Makefile	2016-04-18 09:59:15 +0000
@@ -1105,15 +1105,11 @@
 		fi; \
 	done
 ifeq ($(LIVE_FILESYSTEM),1)
-	-cp -a $(LIVEIMAGES)/$(FULLARCH).manifest $(OUT)/$(call CDBASE,$$n).manifest
-	-if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-remove ]; then \
-		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
-	elif [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-desktop ]; then \
-		cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
-	fi
-ifeq ($(CDIMAGE_SQUASHFS_BASE),1)
-	-cp -a $(LIVEIMAGES)/$(FULLARCH).squashfs $(OUT)/$(call CDBASE,$$n).squashfs
-endif
+	-for item in squashfs size gpg manifest manifest-remove manifest-desktop; do \
+		if [ -e "$(LIVEIMAGES)/$(FULLARCH).$$suffix" ]; then \
+			cp -a "$(LIVEIMAGES)/$(FULLARCH).$$suffix" "$(OUT)/$(call CDEBASE,$$n).$$suffix" \
+		fi \
+	done
 endif
 
 ifeq ($(SUBARCH),ac100)