diff --git a/release/release.sh b/release/release.sh
index 90560d2e85..23cb7ca1d0 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -308,9 +308,12 @@ extra_chroot_setup() {
 		PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/mports"
 		PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
 		for _PORT in ${EMBEDDEDPORTS}; do
+			# mports' deinstall fails if the package is not installed.
+			eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
+				/usr/mports/${_PORT} deinstall || true
 			eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
 				/usr/mports/${_PORT} \
-				FORCE_PKG_REGISTER=1 deinstall install clean distclean
+				FORCE_PKG_REGISTER=1 install clean distclean
 		done
 	fi
 
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index cd69f33c17..9cd9ab483a 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -79,7 +79,7 @@ arm_create_disk() {
 		chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1
 		chroot ${CHROOTDIR} gpart add -t midnightbsd ${mddev}
 		chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2
-		chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k -b 64k ${mddev}s2
+		chroot ${CHROOTDIR} gpart add -t mnbsd-ufs -a 64k -b 64k ${mddev}s2
 		chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a
 	fi