diff --git a/Makefile b/Makefile
index a2b15050..ced7d5e2 100644
--- a/Makefile
+++ b/Makefile
@@ -103,9 +103,9 @@ define CHECK_SIZE
 endef
 
 define REPACK_FIRMWARE
-	cd $(TARGET)/images && mv -f rootfs.tar rootfs.$(BR2_OPENIPC_SOC_MODEL).tar
-	$(if $(1),cd $(TARGET)/images && mv -f $(1) $(1).$(BR2_OPENIPC_SOC_MODEL))
-	$(if $(2),cd $(TARGET)/images && mv -f $(2) $(2).$(BR2_OPENIPC_SOC_MODEL))
+	cd $(TARGET)/images && if test -e rootfs.tar; then mv -f rootfs.tar rootfs.$(BR2_OPENIPC_SOC_MODEL).tar; fi
+	$(if $(1),cd $(TARGET)/images && if test -e $(1); then mv -f $(1) $(1).$(BR2_OPENIPC_SOC_MODEL)); fi
+	$(if $(2),cd $(TARGET)/images && if test -e $(2); then mv -f $(2) $(2).$(BR2_OPENIPC_SOC_MODEL)); fi
 	$(if $(1),cd $(TARGET)/images && md5sum $(1).$(BR2_OPENIPC_SOC_MODEL) > $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum)
 	$(if $(2),cd $(TARGET)/images && md5sum $(2).$(BR2_OPENIPC_SOC_MODEL) > $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum)
 	$(if $(1),$(eval KERNEL = $(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum),$(eval KERNEL =))