diff --git a/lkm/Makefile b/lkm/Makefile
index 1262bdfd71ab..e71bd1765c7a 100644
--- a/lkm/Makefile
+++ b/lkm/Makefile
@@ -1,5 +1,6 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:26 wollman Exp $
 
-SUBDIR=	ip_mroute_mod
+SUBDIR=	cd9660 fdesc ip_mroute_mod kernfs mfs msdos nullfs portal \
+	procfs umapfs union
 
 .include <bsd.subdir.mk>
diff --git a/lkm/cd9660/Makefile b/lkm/cd9660/Makefile
new file mode 100644
index 000000000000..a7ee27b7bf7d
--- /dev/null
+++ b/lkm/cd9660/Makefile
@@ -0,0 +1,11 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/isofs/cd9660
+KMOD=	cd9660_mod
+SRCS=	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
+	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DCD9660
+
+.include <bsd.kmod.mk>
diff --git a/lkm/fdesc/Makefile b/lkm/fdesc/Makefile
new file mode 100644
index 000000000000..7aa2a7d6a675
--- /dev/null
+++ b/lkm/fdesc/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/fdesc
+KMOD=	fdesc_mod
+SRCS=	fdesc_vfsops.c fdesc_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DFDESC
+
+.include <bsd.kmod.mk>
diff --git a/lkm/kernfs/Makefile b/lkm/kernfs/Makefile
new file mode 100644
index 000000000000..1fbe7f76521e
--- /dev/null
+++ b/lkm/kernfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/kernfs
+KMOD=	kernfs_mod
+SRCS=	kernfs_vfsops.c kernfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DKERNFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/mfs/Makefile b/lkm/mfs/Makefile
new file mode 100644
index 000000000000..b3aee055aacb
--- /dev/null
+++ b/lkm/mfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/ufs/mfs
+KMOD=	mfs_mod
+SRCS=	mfs_vfsops.c mfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DFFS -DMFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/msdos/Makefile b/lkm/msdos/Makefile
new file mode 100644
index 000000000000..777699da0897
--- /dev/null
+++ b/lkm/msdos/Makefile
@@ -0,0 +1,11 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/msdosfs
+KMOD=	msdos_mod
+SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_denode.c \
+	msdosfs_lookup.c msdosfs_vfsops.c msdosfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DMSDOSFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/nullfs/Makefile b/lkm/nullfs/Makefile
new file mode 100644
index 000000000000..fc71e6a33ea6
--- /dev/null
+++ b/lkm/nullfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/nullfs
+KMOD=	null_mod
+SRCS=	null_subr.c null_vfsops.c null_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DNULLFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/portal/Makefile b/lkm/portal/Makefile
new file mode 100644
index 000000000000..529314d1f6fe
--- /dev/null
+++ b/lkm/portal/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/portal
+KMOD=	portal_mod
+SRCS=	portal_vfsops.c portal_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DPORTAL
+
+.include <bsd.kmod.mk>
diff --git a/lkm/procfs/Makefile b/lkm/procfs/Makefile
new file mode 100644
index 000000000000..951d65d49b5b
--- /dev/null
+++ b/lkm/procfs/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/procfs \
+	${.CURDIR}/../../sys/${MACHINE}/${MACHINE}
+KMOD=	procfs_mod
+SRCS=	procfs_machdep.c procfs_ctl.c procfs_fpregs.c procfs_mem.c \
+	procfs_note.c procfs_regs.c procfs_status.c procfs_subr.c \
+	procfs_vfsops.c procfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DPROCFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/umapfs/Makefile b/lkm/umapfs/Makefile
new file mode 100644
index 000000000000..c8c26c8da2d0
--- /dev/null
+++ b/lkm/umapfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/umapfs
+KMOD=	umap_mod
+SRCS=	umap_subr.c umap_vfsops.c umap_vnops.c
+NOMAN=
+VFS_LKM= yes
+CFLAGS+= -DUMAPFS
+
+.include <bsd.kmod.mk>
diff --git a/lkm/union/Makefile b/lkm/union/Makefile
new file mode 100644
index 000000000000..2a1cf7efd3dd
--- /dev/null
+++ b/lkm/union/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/union
+KMOD=	union_mod
+SRCS=	union_subr.c union_vfsops.c union_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+=	-DUNION
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 1262bdfd71ab..e71bd1765c7a 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,5 +1,6 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:26 wollman Exp $
 
-SUBDIR=	ip_mroute_mod
+SUBDIR=	cd9660 fdesc ip_mroute_mod kernfs mfs msdos nullfs portal \
+	procfs umapfs union
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
new file mode 100644
index 000000000000..a7ee27b7bf7d
--- /dev/null
+++ b/sys/modules/cd9660/Makefile
@@ -0,0 +1,11 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/isofs/cd9660
+KMOD=	cd9660_mod
+SRCS=	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
+	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DCD9660
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
new file mode 100644
index 000000000000..7aa2a7d6a675
--- /dev/null
+++ b/sys/modules/fdesc/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/fdesc
+KMOD=	fdesc_mod
+SRCS=	fdesc_vfsops.c fdesc_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DFDESC
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
new file mode 100644
index 000000000000..7aa2a7d6a675
--- /dev/null
+++ b/sys/modules/fdescfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/fdesc
+KMOD=	fdesc_mod
+SRCS=	fdesc_vfsops.c fdesc_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DFDESC
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
new file mode 100644
index 000000000000..1fbe7f76521e
--- /dev/null
+++ b/sys/modules/kernfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/kernfs
+KMOD=	kernfs_mod
+SRCS=	kernfs_vfsops.c kernfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DKERNFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
new file mode 100644
index 000000000000..b3aee055aacb
--- /dev/null
+++ b/sys/modules/mfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/ufs/mfs
+KMOD=	mfs_mod
+SRCS=	mfs_vfsops.c mfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DFFS -DMFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
new file mode 100644
index 000000000000..777699da0897
--- /dev/null
+++ b/sys/modules/msdos/Makefile
@@ -0,0 +1,11 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/msdosfs
+KMOD=	msdos_mod
+SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_denode.c \
+	msdosfs_lookup.c msdosfs_vfsops.c msdosfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DMSDOSFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
new file mode 100644
index 000000000000..777699da0897
--- /dev/null
+++ b/sys/modules/msdosfs/Makefile
@@ -0,0 +1,11 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/msdosfs
+KMOD=	msdos_mod
+SRCS=	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_denode.c \
+	msdosfs_lookup.c msdosfs_vfsops.c msdosfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DMSDOSFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
new file mode 100644
index 000000000000..fc71e6a33ea6
--- /dev/null
+++ b/sys/modules/nullfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/nullfs
+KMOD=	null_mod
+SRCS=	null_subr.c null_vfsops.c null_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DNULLFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
new file mode 100644
index 000000000000..529314d1f6fe
--- /dev/null
+++ b/sys/modules/portal/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/portal
+KMOD=	portal_mod
+SRCS=	portal_vfsops.c portal_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DPORTAL
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
new file mode 100644
index 000000000000..529314d1f6fe
--- /dev/null
+++ b/sys/modules/portalfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/portal
+KMOD=	portal_mod
+SRCS=	portal_vfsops.c portal_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DPORTAL
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
new file mode 100644
index 000000000000..951d65d49b5b
--- /dev/null
+++ b/sys/modules/procfs/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/procfs \
+	${.CURDIR}/../../sys/${MACHINE}/${MACHINE}
+KMOD=	procfs_mod
+SRCS=	procfs_machdep.c procfs_ctl.c procfs_fpregs.c procfs_mem.c \
+	procfs_note.c procfs_regs.c procfs_status.c procfs_subr.c \
+	procfs_vfsops.c procfs_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+= -DPROCFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
new file mode 100644
index 000000000000..c8c26c8da2d0
--- /dev/null
+++ b/sys/modules/umapfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/umapfs
+KMOD=	umap_mod
+SRCS=	umap_subr.c umap_vfsops.c umap_vnops.c
+NOMAN=
+VFS_LKM= yes
+CFLAGS+= -DUMAPFS
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
new file mode 100644
index 000000000000..2a1cf7efd3dd
--- /dev/null
+++ b/sys/modules/union/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/union
+KMOD=	union_mod
+SRCS=	union_subr.c union_vfsops.c union_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+=	-DUNION
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
new file mode 100644
index 000000000000..2a1cf7efd3dd
--- /dev/null
+++ b/sys/modules/unionfs/Makefile
@@ -0,0 +1,10 @@
+#	$Id: Makefile,v 1.1 1994/09/16 20:24:28 wollman Exp $
+
+.PATH:	${.CURDIR}/../../sys/miscfs/union
+KMOD=	union_mod
+SRCS=	union_subr.c union_vfsops.c union_vnops.c
+NOMAN=
+VFS_LKM=
+CFLAGS+=	-DUNION
+
+.include <bsd.kmod.mk>