diff --git a/src/etc/etc.alpha/Makefile.inc b/src/etc/etc.alpha/Makefile.inc
index af1dab34..f72cb8e3 100644
--- a/src/etc/etc.alpha/Makefile.inc
+++ b/src/etc/etc.alpha/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.28 2019/10/12 05:22:48 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.29 2020/05/17 17:04:28 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
@@ -9,5 +9,5 @@ bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/netboot.mop ${RELEASEDIR}
 
 MDEXT=	bsd.rd cd${OSrev}.iso \
-	miniroot${OSrev}.fs \
+	miniroot${OSrev}.img \
 	boot bootxx netboot netboot.mop
diff --git a/src/etc/etc.amd64/Makefile.inc b/src/etc/etc.amd64/Makefile.inc
index b2e2443f..2ae40105 100644
--- a/src/etc/etc.amd64/Makefile.inc
+++ b/src/etc/etc.amd64/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.18 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.19 2020/05/17 17:04:28 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
@@ -9,5 +9,5 @@ bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/BOOTX64.EFI ${RELEASEDIR}
 	cp -p ${DESTDIR}/usr/mdec/BOOTIA32.EFI ${RELEASEDIR}
 
-MDEXT=	bsd.rd cd${OSrev}.iso floppy${OSrev}.fs miniroot${OSrev}.fs \
+MDEXT=	bsd.rd cd${OSrev}.iso floppy${OSrev}.img miniroot${OSrev}.img \
 	pxeboot cdboot cdbr BOOTX64.EFI BOOTIA32.EFI
diff --git a/src/etc/etc.amd64/disktab b/src/etc/etc.amd64/disktab
index afebdd8b..f2ae7cfa 100644
--- a/src/etc/etc.amd64/disktab
+++ b/src/etc/etc.amd64/disktab
@@ -1,16 +1,16 @@
-#	$OpenBSD: disktab,v 1.23 2019/11/15 03:10:21 deraadt Exp $
+#	$OpenBSD: disktab,v 1.24 2020/05/17 17:04:28 deraadt Exp $
 
 mini34|gzip bsd.rd disk image 4.4.6875MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#150:\
 	:pa#9536:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#9600:oc#0:
 
-install360|install.fs disk image 360MB:\
+install360|install.img disk image 360MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#14528:\
 	:pa#929728:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#929792:oc#0:
 
-install280|install.fs disk image 280MB:\
+install280|install.img disk image 280MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#8960:\
 	:pa#573376:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#573440:oc#0:
diff --git a/src/etc/etc.arm64/Makefile.inc b/src/etc/etc.arm64/Makefile.inc
index 9e999b69..005eb638 100644
--- a/src/etc/etc.arm64/Makefile.inc
+++ b/src/etc/etc.arm64/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2018/02/21 00:43:03 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2020/05/17 17:04:28 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/BOOTAA64.EFI ${RELEASEDIR}
 
-MDEXT=	bsd.rd BOOTAA64.EFI miniroot${OSrev}.fs
+MDEXT=	bsd.rd BOOTAA64.EFI miniroot${OSrev}.img
diff --git a/src/etc/etc.armv7/Makefile.inc b/src/etc/etc.armv7/Makefile.inc
index b43edd42..f7d6128b 100644
--- a/src/etc/etc.armv7/Makefile.inc
+++ b/src/etc/etc.armv7/Makefile.inc
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.16 2017/09/01 04:40:40 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.17 2020/05/17 17:04:29 deraadt Exp $
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/BOOTARM.EFI ${RELEASEDIR}
 
 MDEXT=	bsd.rd BOOTARM.EFI \
-	miniroot-am335x-${OSrev}.fs \
-	miniroot-cubie-${OSrev}.fs miniroot-cubox-${OSrev}.fs \
-	miniroot-nitrogen-${OSrev}.fs miniroot-panda-${OSrev}.fs \
-	miniroot-wandboard-${OSrev}.fs
+	miniroot-am335x-${OSrev}.img \
+	miniroot-cubie-${OSrev}.img miniroot-cubox-${OSrev}.img \
+	miniroot-nitrogen-${OSrev}.img miniroot-panda-${OSrev}.img \
+	miniroot-wandboard-${OSrev}.img
diff --git a/src/etc/etc.hppa/Makefile.inc b/src/etc/etc.hppa/Makefile.inc
index 728c0bbf..d687189d 100644
--- a/src/etc/etc.hppa/Makefile.inc
+++ b/src/etc/etc.hppa/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.13 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.14 2020/05/17 17:04:29 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
 
-MDEXT=	bsd.rd cd${OSrev}.iso lif${OSrev}.fs xxboot
+MDEXT=	bsd.rd cd${OSrev}.iso lif${OSrev}.img xxboot
diff --git a/src/etc/etc.i386/Makefile.inc b/src/etc/etc.i386/Makefile.inc
index d187d917..06fb69be 100644
--- a/src/etc/etc.i386/Makefile.inc
+++ b/src/etc/etc.i386/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.25 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.26 2020/05/17 17:04:29 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
@@ -7,5 +7,5 @@ bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
 	cp -p ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
 
-MDEXT=	bsd.rd cd${OSrev}.iso floppy${OSrev}.fs miniroot${OSrev}.fs \
+MDEXT=	bsd.rd cd${OSrev}.iso floppy${OSrev}.img miniroot${OSrev}.img \
 	pxeboot cdboot cdbr
diff --git a/src/etc/etc.i386/disktab b/src/etc/etc.i386/disktab
index d253a991..4e02e373 100644
--- a/src/etc/etc.i386/disktab
+++ b/src/etc/etc.i386/disktab
@@ -1,16 +1,16 @@
-#	$OpenBSD: disktab,v 1.29 2019/12/01 05:16:40 deraadt Exp $
+#	$OpenBSD: disktab,v 1.30 2020/05/17 17:04:29 deraadt Exp $
 
 mini34|gzip bsd.rd disk image 4.34375MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#126:\
 	:pa#8000:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#8064:oc#0:
 
-install360|install.fs disk image 360MB:\
+install360|install.img disk image 360MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#14400:\
 	:pa#921536:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#921600:oc#0:
 
-install240|install.fs disk image 240MB:\
+install240|install.img disk image 240MB:\
 	:dt=rdroot:se#512:nt#1:ns#64:nc#7680:\
 	:pa#491456:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#491520:oc#0:
diff --git a/src/etc/etc.landisk/Makefile.inc b/src/etc/etc.landisk/Makefile.inc
index bebb94d8..ba3afb90 100644
--- a/src/etc/etc.landisk/Makefile.inc
+++ b/src/etc/etc.landisk/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2020/05/17 17:04:29 deraadt Exp $
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR}
 	cp -p ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
 	cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
 
-MDEXT=	mbr bsd.rd xxboot boot miniroot${OSrev}.fs
+MDEXT=	mbr bsd.rd xxboot boot miniroot${OSrev}.img
diff --git a/src/etc/etc.loongson/Makefile.inc b/src/etc/etc.loongson/Makefile.inc
index 785745d8..a781a2ca 100644
--- a/src/etc/etc.loongson/Makefile.inc
+++ b/src/etc/etc.loongson/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2020/05/17 17:04:29 deraadt Exp $
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
 
-MDEXT=	bsd.rd boot miniroot${OSrev}.fs
+MDEXT=	bsd.rd boot miniroot${OSrev}.img
diff --git a/src/etc/etc.luna88k/Makefile.inc b/src/etc/etc.luna88k/Makefile.inc
index a8ce33b6..10e877ee 100644
--- a/src/etc/etc.luna88k/Makefile.inc
+++ b/src/etc/etc.luna88k/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2020/05/17 17:04:29 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
@@ -6,5 +6,5 @@ bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
 
 MDEXT=	bsd.rd \
-	miniroot${OSrev}.fs \
+	miniroot${OSrev}.img \
 	boot
diff --git a/src/etc/etc.octeon/Makefile.inc b/src/etc/etc.octeon/Makefile.inc
index 1d54c587..e2ab3e5d 100644
--- a/src/etc/etc.octeon/Makefile.inc
+++ b/src/etc/etc.octeon/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2019/08/04 08:53:14 visa Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2020/05/17 17:04:29 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
 bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
 
-MDEXT=	boot bsd.rd miniroot${OSrev}.fs
+MDEXT=	boot bsd.rd miniroot${OSrev}.img
diff --git a/src/etc/etc.sparc64/Makefile.inc b/src/etc/etc.sparc64/Makefile.inc
index 973dea37..e3dfa36b 100644
--- a/src/etc/etc.sparc64/Makefile.inc
+++ b/src/etc/etc.sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.15 2017/04/04 00:03:12 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.16 2020/05/17 17:04:29 deraadt Exp $
 
 KERNELS += GENERIC.MP bsd.mp
 
@@ -6,5 +6,5 @@ bootblocks:
 	cp -p ${DESTDIR}/usr/mdec/{bootblk,ofwboot,ofwboot.net} ${RELEASEDIR}
 
 MDEXT=	bsd.rd cd${OSrev}.iso \
-	miniroot${OSrev}.fs floppy${OSrev}.fs floppyB${OSrev}.fs \
+	miniroot${OSrev}.img floppy${OSrev}.img floppyB${OSrev}.img \
 	bootblk ofwboot ofwboot.net
diff --git a/src/etc/examples/vm.conf b/src/etc/examples/vm.conf
index e1f4f01e..f655f030 100644
--- a/src/etc/examples/vm.conf
+++ b/src/etc/examples/vm.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: vm.conf,v 1.9 2019/12/14 09:46:02 kn Exp $
+# $OpenBSD: vm.conf,v 1.10 2020/05/17 17:04:29 deraadt Exp $
 
 #
 # Macros
@@ -29,7 +29,7 @@ vm "openbsd.vm" {
 	disk "/home/vm/OpenBSD.img"
 
 	# Second disk from OpenBSD contains the install sets
-	disk $sets "install60.fs"
+	disk $sets "install60.img"
 
 	# Interface will show up as tap(4) on the host and as vio(4) in the VM
 	interface { switch "uplink" }