-INST1_DIRS= dev mnt
-INST1_FILES= ${COPYRIGHT}
-INST1_FILES+= bin/[ bin/cat bin/df bin/expr bin/ls bin/mkdir
-INST1_FILES+= bin/sh bin/sync bin/test
-INST1_FILES+= dev/MAKEDEV dev/MAKEDEV.local
-INST1_FILES+= etc/disktab etc/group etc/master.passwd etc/passwd
-INST1_FILES+= etc/pwd.db etc/spwd.db
-INST1_FILES+= sbin/disklabel sbin/halt sbin/init sbin/mount sbin/umount
-INST1_FILES+= sbin/newfs sbin/reboot
-INST1_FILES+= usr/bin/cpio
-INST1_FILES+= ${MDEC}
-INST1_FILES+= usr/sbin/bad144
-
-INST2_FILES= ${COPYRIGHT}
-INST2_FILES+= usr/bin/gunzip usr/bin/gzcat usr/bin/gzip usr/bin/zcat
-INST2_CPIO= bin/chmod bin/cp bin/dd bin/mv bin/pwd bin/rm bin/stty
-INST2_CPIO+= etc/protocols etc/services
-INST2_CPIO+= sbin/ifconfig sbin/fsck sbin/mknod
-#INST2_CPIO+= sbin/mount_pcfs sbin/mount_isofs
-INST2_CPIO+= sbin/route sbin/shutdown sbin/slattach
-INST2_CPIO+= tmp
-INST2_CPIO+= usr/bin/awk usr/bin/chgrp usr/bin/ftp
-INST2_CPIO+= usr/bin/more usr/bin/tar usr/bin/tip usr/bin/zcat
-INST2_CPIO+= usr/bin/elvis usr/bin/ex usr/bin/vi usr/bin/view
-#INST2_CPIO+= usr/local/bin/mread usr/local/bin/rz
-INST2_CPIO+= usr/sbin/update usr/sbin/chown
-INST2_CPIO+= var
+FILESYSTEM_DIRS= bin dev etc mnt sbin usr usr/bin usr/mdec usr/sbin
+FILESYSTEM_TREES= dev
+FILESYSTEM_FILES= ${COPYRIGHT}
+FILESYSTEM_FILES+= bin/[ bin/expr bin/ls bin/mkdir bin/rm
+FILESYSTEM_FILES+= bin/sh bin/sync bin/test
+FILESYSTEM_FILES+= dev/MAKEDEV
+FILESYSTEM_FILES+= etc/group
+FILESYSTEM_FILES+= etc/master.passwd etc/passwd etc/pwd.db
+FILESYSTEM_FILES+= sbin/disklabel sbin/halt sbin/init
+FILESYSTEM_FILES+= sbin/mount sbin/mount_pcfs
+FILESYSTEM_FILES+= sbin/newfs
+FILESYSTEM_FILES+= sbin/umount
+FILESYSTEM_FILES+= sbin/fdisk
+FILESYSTEM_FILES+= usr/bin/cpio
+FILESYSTEM_FILES+= ${MDEC}
+FILESYSTEM_FILES+= usr/sbin/bad144
+
+CPIO_FILES= ${COPYRIGHT}
+CPIO_FILES+= usr/bin/gunzip usr/bin/gzcat usr/bin/gzip usr/bin/zcat
+CPIO_CPIO= bin/chmod bin/cat bin/cp bin/dd bin/df bin/mv bin/pwd bin/stty
+CPIO_CPIO+= etc/protocols etc/services etc/spwd.db
+CPIO_CPIO+= sbin/ifconfig sbin/fsck sbin/mknod sbin/mount_isofs
+CPIO_CPIO+= sbin/reboot sbin/route sbin/slattach
+CPIO_CPIO+= tmp
+CPIO_CPIO+= usr/bin/awk usr/bin/chgrp usr/bin/ftp
+CPIO_CPIO+= usr/bin/more usr/bin/tar usr/bin/tip
+CPIO_CPIO+= usr/bin/elvis usr/bin/ex usr/bin/vi usr/bin/view
+CPIO_CPIO+= usr/sbin/update usr/sbin/chown
+CPIO_CPIO_DIRS= var var/tmp var/spool var/spool/lock
+
+CRYPT_LIB= lib/libcrypt
+CRYPT_SRCS= bin/ed bin/rcp
+CRYPT_SRCS+= libexec/ftpd libexec/makekey libexec/rexecd libexec/rlogind
+CRYPT_SRCS+= libexec/rshd libexec/telnetd libexec/uucpd
+CRYPT_SRCS+= usr.bin/bdes usr.bin/lock usr.bin/login usr.bin/passwd
+CRYPT_SRCS+= usr.bin/rlogin usr.bin/rsh usr.bin/su usr.bin/telnet
+CRYPT_DIRS= bin usr usr/bin usr/lib usr/libexec