diff --git a/release/Makefile.vm b/release/Makefile.vm
index 17229bfb2792..fe955d30d8c1 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -50,8 +50,8 @@ vm-${_CW:tl}:
 
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 CLEANDIRS+=	${VMTARGETS}
-CLEANFILES+=	${VMBASE}.img
 . for FORMAT in ${VMFORMATS}
+CLEANFILES+=	${FORMAT}.img
 CLEANFILES+=	${VMBASE}.${FORMAT}
 . endfor
 .endif
@@ -65,7 +65,7 @@ vm-image:
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-		-i ${.OBJDIR}/${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
+		-i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT}
 . endfor
 .endif