diff --git a/distrib/vax/floppy/Makefile b/distrib/vax/floppy/Makefile
index ec5db5011b49..45f765ba0094 100644
--- a/distrib/vax/floppy/Makefile
+++ b/distrib/vax/floppy/Makefile
@@ -1,50 +1,25 @@
-#	$NetBSD: Makefile,v 1.1 2001/03/04 20:28:50 matt Exp $
+#	$NetBSD: Makefile,v 1.2 2002/03/28 04:51:25 lukem Exp $
 
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
+.include "${.CURDIR}/../../Makefile.inc"
 .include <bsd.own.mk>
 .include <bsd.kernobj.mk>
 
-IMAGE=		boot.fs
 INSTKERNOBJ!=	cd ${.CURDIR}/../ramdisk-kernel && ${PRINTOBJDIR}
-KERN=		${KERNOBJDIR}/INSTALL/netbsd
 
-MOUNT_POINT?=	/mnt
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_RDEVC=	/dev/r${VND}c
-FD?=		fd0
-FD_RDEV=	/dev/r${FD}a
-MDEC=		${DESTDIR}/usr/mdec
+IMAGE=		boot.fs
+IMAGESIZE=	1440k
 
-DISKTYPE=	rx23
+LISTS=		${.CURDIR}/list
+IMAGEENDIAN=	le
+IMAGEDEPENDS=	${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/xxboot \
+		${INSTKERNOBJ}/netbsd.INSTALL.gz 
 
-CLEANFILES+=	boot.fs
+PARSELISTENV+=	INSTKERNOBJ=${INSTKERNOBJ:Q}
 
-dependall all: ${MDEC}/boot ${INSTKERNOBJ}/netbsd.INSTALL.gz
-	dd if=/dev/zero of=${IMAGE} bs=1440k count=1
-	vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE}
-	disklabel -Rr ${VND} ${.CURDIR}/floppy.lbl
-	newfs -B le -m 0 -o space -i 56000 -c 80 -f 512 -b 4096 ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	cp ${MDEC}/boot ${MOUNT_POINT}/boot
-	cp ${INSTKERNOBJ}/netbsd.INSTALL.gz ${MOUNT_POINT}/netbsd
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
-	@echo "installing new bootblocks"
-	sync
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-	${MDEC}/installboot -v ${IMAGE} ${MDEC}/xxboot
+realall: ${IMAGE} ${DESTDIR}/usr/mdec/xxboot
+	${DESTDIR}/usr/mdec/installboot -v ${IMAGE} ${DESTDIR}/usr/mdec/xxboot
+		# XXXDISTRIB
 
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
+.include "${DISTRIBDIR}/common/Makefile.image"
 
-clean cleandir distclean:
-	rm -f *.core ${IMAGE} ${CLEANFILES}
-
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>
diff --git a/distrib/vax/floppy/floppy.lbl b/distrib/vax/floppy/floppy.lbl
deleted file mode 100644
index fe17d1e8c812..000000000000
--- a/distrib/vax/floppy/floppy.lbl
+++ /dev/null
@@ -1,23 +0,0 @@
-# /dev/rvnd0c:
-type: floppy
-disk: rx23
-label: 
-flags: removable
-bytes/sector: 512
-sectors/track: 18
-tracks/cylinder: 2
-sectors/cylinder: 36
-cylinders: 80
-total sectors: 2880
-rpm: 300
-interleave: 1
-trackskew: 0
-cylinderskew: 0
-headswitch: 0		# microseconds
-track-to-track seek: 0	# microseconds
-drivedata: 0 
-
-3 partitions:
-#        size   offset     fstype   [fsize bsize   cpg]
-  a:     2880        0     4.2BSD      512  4096   32    # (Cyl.    0 - 79)
-  c:     2880        0     unused      512  4096         # (Cyl.    0 - 79)
diff --git a/distrib/vax/floppy/list b/distrib/vax/floppy/list
new file mode 100644
index 000000000000..a4bb7c005f59
--- /dev/null
+++ b/distrib/vax/floppy/list
@@ -0,0 +1,4 @@
+#	$NetBSD: list,v 1.1 2002/03/28 04:51:26 lukem Exp $
+
+COPY	${DESTDIR}/usr/mdec/boot		boot
+COPY	${INSTKERNOBJ}/netbsd.INSTALL.gz	netbsd