diff --git a/distrib/alpha/instkernel/ramdisk/Makefile b/distrib/alpha/instkernel/ramdisk/Makefile
index 49a3f210d3bb..7f5e60159d9c 100644
--- a/distrib/alpha/instkernel/ramdisk/Makefile
+++ b/distrib/alpha/instkernel/ramdisk/Makefile
@@ -1,61 +1,42 @@
-#	$NetBSD: Makefile,v 1.14 2002/02/04 01:11:09 ross Exp $
-
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-IMAGE=		ramdisk.fs
-
-CBIN=		ramdiskbin
-
-MOUNT_POINT?=	/mnt
-# DEV/RDEV file system device, CDEV/RDEV vnconfig device
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-IMAGE?=		xxx.fs
-MDEC=		${DESTDIR}/usr/mdec
-
-LISTS=		list
-CRUNCHCONF=	${CBIN}.conf
-MTREECONF=	mtree.conf
-
-CRUNCHGEN?=	crunchgen
-
-all: ${CBIN} 
-	dd if=/dev/zero of=${IMAGE} count=9000
-	vnconfig -v -c ${VND} ${IMAGE}
-#	disklabel -rw ${VND} ${DISKTYPE}
-	newfs -B le -m 0 -o space -i 5120 ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-	${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    KERNOBJDIR=${KERNOBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/src/runlist.sh ${.CURDIR}/${LISTS}
-	@echo chdir '$${.CURDIR}/../../../notes/alpha; ${MAKE} INSTALL.more'
-	@chdir ${.CURDIR}/../../../notes/alpha; ${MAKE} INSTALL.more
-	cp `chdir ${.CURDIR}/../../../notes/alpha; ${MAKE} echomore`	\
-		${MOUNT_POINT}
-	@echo ""
-	@df -i ${MOUNT_POINT}
-	@echo ""
-	umount ${MOUNT_POINT}
-	vnconfig -u ${VND}
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-	-/bin/rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	${CRUNCHGEN} -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	${MAKE} -f ${CBIN}.mk all
-
-clean cleandir distclean:
-	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
+#	$NetBSD: Makefile,v 1.15 2002/03/07 23:51:48 lukem Exp $
 
+.include "${.CURDIR}/../../../Makefile.inc"
 .include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-.include <bsd.sys.mk>
+
+IMAGE=		ramdisk.fs
+IMAGESIZE=	9000b
+MAKEFS_FLAGS=	-o density=5k
+
+WARNS=		1
+
+CRUNCHBIN=	ramdiskbin
+LISTS=		${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
+MTREECONF=	${DISTRIBDIR}/common/mtree.common #${.CURDIR}/mtree.conf
+IMAGEENDIAN=	le
+MAKEDEVTARGETS=	minimal
+IMAGEDEPENDS+=	${CRUNCHBIN} \
+		disktab.preinstall dot.hdprofile dot.profile \
+		${.CURDIR}/../src/install.sh ${.CURDIR}/../src/upgrade.sh \
+		${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx_ffs \
+		${DESTDIR}/usr/share/misc/termcap \
+		${_SRC_TOP_}/distrib/utils/script-installer/dot.commonutils \
+		${_SRC_TOP_}/distrib/utils/script-installer/dot.instutils \
+		${_SRC_TOP_}/etc/group ${_SRC_TOP_}/etc/master.passwd \
+		${_SRC_TOP_}/etc/netconfig ${_SRC_TOP_}/etc/protocols \
+		${_SRC_TOP_}/etc/services
+
+INSTALLNOTES!=	cd ${DISTRIBDIR}/notes/alpha && ${MAKE} echomore 
+IMAGEDEPENDS+=	${INSTALLNOTES}
+POPULATEENV+=	INSTALLNOTES=${INSTALLNOTES:Q} PWD_MKDB=${PWD_MKDB:Q}
+
+
+realall: ${IMAGE}
+
+release:
+
+
+.include "${DISTRIBDIR}/common/Makefile.crunch"
+.include "${DISTRIBDIR}/common/Makefile.makedev"
+.include "${DISTRIBDIR}/common/Makefile.image"
+
+.include <bsd.prog.mk>
diff --git a/distrib/alpha/instkernel/ramdisk/list b/distrib/alpha/instkernel/ramdisk/list
index 505b21d0037a..a1c20dee6ee4 100644
--- a/distrib/alpha/instkernel/ramdisk/list
+++ b/distrib/alpha/instkernel/ramdisk/list
@@ -1,91 +1,88 @@
-#	$NetBSD: list,v 1.12 2000/06/07 19:54:50 thorpej Exp $
+#	$NetBSD: list,v 1.13 2002/03/07 23:51:48 lukem Exp $
 
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/ramdiskbin		ramdiskbin
-LINK	ramdiskbin			sysinst
-LINK	ramdiskbin			bin/cat
-LINK	ramdiskbin			bin/chmod
-LINK	ramdiskbin			bin/cp
-LINK	ramdiskbin			bin/dd
-LINK	ramdiskbin			bin/df
-LINK	ramdiskbin			bin/ed
-LINK	ramdiskbin			bin/ln
-LINK	ramdiskbin			bin/ls
-LINK	ramdiskbin			bin/mkdir
-LINK	ramdiskbin			bin/mt
-LINK	ramdiskbin			bin/mv
-LINK	ramdiskbin			bin/pax
-LINK	ramdiskbin			bin/pwd
-LINK	ramdiskbin			bin/rm
-LINK	ramdiskbin			bin/sh
-LINK	ramdiskbin			bin/stty
-LINK	ramdiskbin			bin/sync
-LINK	ramdiskbin			bin/test
-LINK	ramdiskbin			bin/[
-LINK	ramdiskbin			sbin/disklabel
-LINK	ramdiskbin			sbin/fsck
-LINK	ramdiskbin			sbin/fsck_ffs
-LINK	ramdiskbin			sbin/halt
-LINK	ramdiskbin			sbin/ifconfig
-LINK	ramdiskbin			sbin/init
-LINK	ramdiskbin			sbin/mknod
-LINK	ramdiskbin			sbin/mount
-LINK	ramdiskbin			sbin/mount_cd9660
-LINK	ramdiskbin			sbin/mount_ffs
-LINK	ramdiskbin			sbin/mount_kernfs
-LINK	ramdiskbin			sbin/mount_msdos
-LINK	ramdiskbin			sbin/mount_nfs
-LINK	ramdiskbin			sbin/newfs
-LINK	ramdiskbin			sbin/ping
-LINK	ramdiskbin			sbin/reboot
-LINK	ramdiskbin			sbin/restore
-LINK	ramdiskbin			sbin/route
-LINK	ramdiskbin			sbin/rrestore
-LINK	ramdiskbin			sbin/shutdown
-LINK	ramdiskbin			sbin/slattach
-LINK	ramdiskbin			sbin/swapctl
-LINK	ramdiskbin			sbin/umount
-SYMLINK	/bin/cat			usr/bin/chgrp
-SYMLINK	/bin/cat			usr/bin/ftp
-SYMLINK	/bin/cat			usr/bin/gunzip
-SYMLINK	/bin/cat			usr/bin/gzcat
-SYMLINK	/bin/cat			usr/bin/gzip
-SYMLINK	/bin/cat			usr/bin/less
-SYMLINK	/bin/cat			usr/bin/more
-SYMLINK	/bin/cat			usr/bin/sed
-SYMLINK	/bin/cat			usr/bin/strings
-SYMLINK	/bin/cat			usr/bin/tar
-SYMLINK	/bin/cat			usr/bin/tip
-SYMLINK	/bin/cat			usr/bin/tset
-SYMLINK	/bin/cat			usr/mdec/installboot
-SYMLINK	/bin/cat			usr/sbin/bad144
-SYMLINK	/bin/cat			usr/sbin/chown
-SYMLINK	/bin/cat			usr/sbin/chroot
-SPECIAL	/bin/rm ramdiskbin
+SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+SRCDIRS	sys/arch/@MACHINE@/stand
 
-# copy the MAKEDEV script and make some devices
-COPY	${CURDIR}/../../../../etc/etc.alpha/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV minimal
-SPECIAL	/bin/rm dev/MAKEDEV
+
+PROG	bin/cat		usr/bin/strings
+PROG	bin/chmod
+PROG	bin/cp
+PROG	bin/dd
+PROG	bin/df
+PROG	bin/ed
+PROG	bin/ln
+PROG	bin/ls
+PROG	bin/mkdir
+PROG	bin/mt
+PROG	bin/mv
+PROG	bin/pax		usr/bin/tar
+PROG	bin/pwd
+PROG	bin/rm
+PROG	bin/sh
+PROG	bin/stty
+PROG	bin/sync
+
+PROG	sbin/disklabel
+PROG	sbin/fsck
+PROG	sbin/fsck_ffs
+PROG	sbin/ifconfig
+PROG	sbin/init
+PROG	sbin/mknod
+PROG	sbin/mount
+PROG	sbin/mount_cd9660
+PROG	sbin/mount_ffs
+PROG	sbin/mount_kernfs
+PROG	sbin/mount_msdos
+PROG	sbin/mount_nfs
+PROG	sbin/newfs
+PROG	sbin/ping
+PROG	sbin/reboot	sbin/halt
+PROG	sbin/restore	sbin/rrestore
+PROG	sbin/route
+PROG	sbin/shutdown
+PROG	sbin/slattach
+PROG	sbin/swapctl
+PROG	sbin/umount
+
+PROG	usr/bin/ftp
+PROG	usr/bin/gzip	usr/bin/gunzip usr/bin/gzcat
+PROG	usr/bin/less	usr/bin/more
+PROG	usr/bin/sed
+PROG	usr/bin/tip
+PROG	usr/bin/tset
+
+PROG	usr/mdec/installboot
+
+PROG	usr/sbin/bad144
+PROG	usr/sbin/chown	usr/bin/chgrp
+PROG	usr/sbin/chroot
+
+# init invokes the shell as -sh
+ARGVLN	sh -sh
+
+SPECIAL	ping		srcdir	distrib/utils/x_ping
+
+LIBS	-ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm
 
 # we need the boot blocks /usr/mdec
 COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
 COPY	${DESTDIR}/usr/mdec/bootxx_ffs		usr/mdec/bootxx_ffs
 
 # various files that we need in /etc for the install
-COPY	${CURDIR}/../../../../etc/group		etc/group
-COPY	${CURDIR}/../../../../etc/master.passwd	etc/master.passwd
-COPY	${CURDIR}/../../../../etc/protocols	etc/protocols
-COPY	${CURDIR}/../../../../etc/netconfig	etc/netconfig
-COPY	${CURDIR}/../../../../etc/services	etc/services
-SPECIAL	pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL	/bin/rm etc/spwd.db
-SPECIAL	/bin/rm etc/pwd.db
+COPY	${_SRC_TOP_}/etc/group		etc/group
+COPY	${_SRC_TOP_}/etc/master.passwd	etc/master.passwd
+COPY	${_SRC_TOP_}/etc/protocols	etc/protocols
+COPY	${_SRC_TOP_}/etc/netconfig	etc/netconfig
+COPY	${_SRC_TOP_}/etc/services	etc/services
+
+CMD	${PWD_MKDB} -L -d . etc/master.passwd
+MTREE	./etc/pwd.db	type=file uname=root gname=wheel mode=0644
+MTREE	./etc/spwd.db	type=file uname=root gname=wheel mode=0600
 
 # and the common installation tools
 COPY	${DESTDIR}/usr/share/misc/termcap	usr/share/misc/termcap
-COPY	${CURDIR}/../../../utils/script-installer/dot.commonutils  .commonutils
-COPY	${CURDIR}/../../../utils/script-installer/dot.instutils	   .instutils
+COPY	${_SRC_TOP_}/distrib/utils/script-installer/dot.commonutils .commonutils
+COPY	${_SRC_TOP_}/distrib/utils/script-installer/dot.instutils   .instutils
 
 # the disktab explanation file
 COPY	${CURDIR}/disktab.preinstall		etc/disktab.preinstall
@@ -95,13 +92,8 @@ COPY	${CURDIR}/dot.profile			.profile
 COPY	${CURDIR}/dot.hdprofile			tmp/.hdprofile
 
 # old-style installation tools
+COPY	${CURDIR}/../src/install.sh		install	755
+COPY	${CURDIR}/../src/upgrade.sh		upgrade	755
 
-COPY	${CURDIR}/../src/install.sh		install
-COPY	${CURDIR}/../src/upgrade.sh		upgrade
-
-SPECIAL chmod 755 install
-SPECIAL chmod 755 upgrade
-
-#the lists of obsolete files used by sysinst  
-SPECIAL sh ${CURDIR}/../../../../distrib/sets/makeobsolete -b -s ${CURDIR}/../../../../distrib/sets -t ./dist
-
+# and the install notes
+COPY	${INSTALLNOTES}				INSTALL.more
diff --git a/distrib/alpha/instkernel/ramdisk/mtree.conf b/distrib/alpha/instkernel/ramdisk/mtree.conf
deleted file mode 100644
index 74cf60356a02..000000000000
--- a/distrib/alpha/instkernel/ramdisk/mtree.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#	$NetBSD: mtree.conf,v 1.2 1999/06/05 20:17:38 bouyer Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-# .
-.
-
-# ./bin
-bin
-# ./bin
-..
-
-# ./dev
-dev
-# ./dev
-..
-
-# ./dist
-dist
-# ./dist
-..
-
-# ./etc
-etc
-# ./etc
-..
-
-# ./mnt
-mnt
-# ./mnt
-..
-
-# ./mnt2
-mnt2
-# ./mnt2
-..
-
-# ./kern
-kern
-# ./kern
-..
-
-# ./sbin
-sbin
-# ./sbin
-..
-
-# ./tmp
-tmp             mode=01777
-# ./tmp
-..
-
-# ./usr
-usr
-
-# ./usr/bin
-bin
-# ./usr/bin
-..
-
-# ./usr/mdec
-mdec
-# ./usr/mdec
-..
-
-# ./usr/sbin
-sbin
-# ./usr/sbin
-..
-
-# ./usr/share
-share
-
-# ./usr/share/misc
-misc
-# ./usr/share/misc
-..
-
-# ./usr/share
-..
-
-# ./usr
-..
diff --git a/distrib/alpha/instkernel/ramdisk/ramdiskbin.conf b/distrib/alpha/instkernel/ramdisk/ramdiskbin.conf
deleted file mode 100644
index 7c4a1f3076c0..000000000000
--- a/distrib/alpha/instkernel/ramdisk/ramdiskbin.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#	$NetBSD: ramdiskbin.conf,v 1.8 2000/02/03 19:25:16 itojun Exp $
-#
-# ramdiskbin.conf - unified binary for the install ramdisk
-#
-
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/alpha/stand
-
-progs bad144 cat chmod chown chroot cp dd df disklabel ed
-progs fsck fsck_ffs ftp gzip ifconfig init installboot less
-progs ln ls mkdir mknod mount mount_cd9660 mount_ffs mount_msdos
-progs mount_nfs mount_kernfs mt mv newfs ping pwd reboot restore rm
-progs route sed sh shutdown slattach stty swapctl sync test
-progs tip umount
-progs sysinst pax
-progs tset
-
-special sysinst srcdir distrib/utils/sysinst/arch/alpha
-special init srcdir distrib/utils/init_s
-special ping srcdir distrib/utils/x_ping
-
-ln pax tar
-ln chown chgrp
-ln gzip gzcat gunzip
-ln less more
-ln sh -sh		# init invokes the shell this way
-ln test [
-ln mount_cd9660 cd9660
-ln mount_ffs ffs
-ln mount_msdos msdos
-ln mount_nfs nfs
-ln mount_kernfs kernfs
-ln reboot halt
-ln restore rrestore
-
-libs -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm