diff --git a/sys/arch/vax/boot/Makefile b/sys/arch/vax/boot/Makefile
index 0bb4bac2595b..0b126ddf5c1e 100644
--- a/sys/arch/vax/boot/Makefile
+++ b/sys/arch/vax/boot/Makefile
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.21 1999/03/06 16:36:04 ragge Exp $
+#	$NetBSD: Makefile,v 1.22 2002/03/29 05:45:07 matt Exp $
 #
 
-SUBDIR=	boot xxboot
+SUBDIR=	boot xxboot xxboot_ustarfs
 .include <bsd.subdir.mk>
diff --git a/sys/arch/vax/boot/xxboot/Makefile b/sys/arch/vax/boot/xxboot/Makefile
index f9ba35602667..3615643f5cdd 100644
--- a/sys/arch/vax/boot/xxboot/Makefile
+++ b/sys/arch/vax/boot/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2002/02/24 01:04:25 matt Exp $
+#	$NetBSD: Makefile,v 1.13 2002/03/29 05:45:08 matt Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -16,7 +16,8 @@ CPPFLAGS+=-D_STANDALONE -DLIBSA_NO_FD_CHECKING -DLIBSA_NO_RAW_ACCESS \
 	-DLIBSA_NO_TWIDDLE -DLIBSA_SINGLE_DEVICE=rom \
 	-DLIBSA_NO_COMPAT_UFS \
 	-DLIBSA_NO_FS_SYMLINK -DLIBSA_NO_FS_CLOSE \
-	-DLIBSA_NO_FS_WRITE -DLIBSA_NO_FS_SEEK
+	-DLIBSA_NO_FS_WRITE -DLIBSA_NO_FS_SEEK \
+	-DNEED_UFS -DNEED_CD9660
 BINDIR=	/usr/mdec
 NOMAN=	# defined
 
@@ -43,6 +44,7 @@ CLEANFILES+= machine ${MACHINE_ARCH}
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 ${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
 	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
+	${SIZE} ${PROG}.out
 	${OBJCOPY} -O binary ${PROG}.out ${PROG}
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c
index ba3e1336254c..d03c7a96c515 100644
--- a/sys/arch/vax/boot/xxboot/bootxx.c
+++ b/sys/arch/vax/boot/xxboot/bootxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.15 2002/02/24 01:04:26 matt Exp $ */
+/* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -43,6 +43,7 @@
 #include "lib/libsa/stand.h"
 #include "lib/libsa/ufs.h"
 #include "lib/libsa/cd9660.h"
+#include "lib/libsa/ustarfs.h"
 
 #include "lib/libkern/libkern.h"
 
@@ -188,9 +189,13 @@ die:
  * - Must be the first file on tape.
  */
 struct fs_ops file_system[] = {
+#ifdef NEED_UFS
 	{ ufs_open, 0, ufs_read, 0, 0, ufs_stat },
+#endif
+#ifdef NEED_CD9660
 	{ cd9660_open, 0, cd9660_read, 0, 0, cd9660_stat },
-#if 0
+#endif
+#ifdef NEED_USTARFS
 	{ ustarfs_open, 0, ustarfs_read, 0, 0, ustarfs_stat },
 #endif
 };
diff --git a/sys/arch/vax/boot/xxboot_ustarfs/Makefile b/sys/arch/vax/boot/xxboot_ustarfs/Makefile
new file mode 100644
index 000000000000..ea7047b13c8e
--- /dev/null
+++ b/sys/arch/vax/boot/xxboot_ustarfs/Makefile
@@ -0,0 +1,48 @@
+#	$NetBSD: Makefile,v 1.1 2002/03/29 05:45:08 matt Exp $
+
+S=	${.CURDIR}/../../../..
+
+.PATH:	${.CURDIR}/../xxboot
+
+PROG=	xxboot_ustarfs
+WARNS?=	1
+
+SRCS=	start.S bootxx.c romread.S str.S
+
+STRIPFLAG=
+CPPFLAGS+=-D_STANDALONE -DLIBSA_NO_FD_CHECKING -DLIBSA_NO_RAW_ACCESS \
+	-DLIBSA_NO_TWIDDLE -DLIBSA_SINGLE_DEVICE=rom \
+	-DLIBSA_NO_COMPAT_UFS \
+	-DLIBSA_NO_FS_SYMLINK -DLIBSA_NO_FS_CLOSE \
+	-DLIBSA_NO_FS_WRITE -DLIBSA_NO_FS_SEEK \
+	-DNEED_USTARFS
+BINDIR=	/usr/mdec
+NOMAN=	# defined
+
+CFLAGS=	-Os
+
+SA_AS=	library
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA=	${SALIB}
+
+KERN_AS=library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN=${KERNLIB}
+
+.if ${MACHINE} == "vax"
+.PHONY: machine-links
+beforedepend: machine-links
+machine-links:
+	@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
+	@[ -h ${MACHINE_ARCH} ] || ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
+.NOPATH: machine ${MACHINE_ARCH}
+CLEANFILES+= machine ${MACHINE_ARCH}
+.endif
+
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
+	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
+	${SIZE} ${PROG}.out
+	${OBJCOPY} -O binary ${PROG}.out ${PROG}
+
+.include <bsd.prog.mk>