diff --git a/distrib/sets/comments b/distrib/sets/comments
index ba3e123fa581..97ee0725403c 100644
--- a/distrib/sets/comments
+++ b/distrib/sets/comments
@@ -46,6 +46,7 @@ base-ipf-lkm loadable kernel module for IPfilter
 base-ipf-root directories for IPfilter
 base-isdn-bin utilities and daemons for ISDN network connectivity
 base-isdn-examples directories for the ISDN example files
+base-kernel-modules loadable kernel modules
 base-krb5-bin commands and utilities for the Kerberos V network authentication system
 base-krb5-examples example configuration files for the Kerberos V network authentication system
 base-krb5-root root file system support for the Kerberos V network authentication system
diff --git a/distrib/sets/lists/base/lkm.mi b/distrib/sets/lists/base/lkm.mi
index 6a1f330d7280..000191269fdf 100644
--- a/distrib/sets/lists/base/lkm.mi
+++ b/distrib/sets/lists/base/lkm.mi
@@ -1,7 +1,9 @@
-# $NetBSD: lkm.mi,v 1.20 2008/01/03 20:47:55 jdc Exp $
+# $NetBSD: lkm.mi,v 1.21 2008/05/02 23:12:00 ad Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
+./kernel/modules/miniroot			base-kernel-modules
+./kernel/modules/miniroot/miniroot.kmod		base-kernel-modules
 ./usr/lkm/adosfs.o				base-vfs-lkm
 ./usr/lkm/bsdcomp.o				base-ppp-lkm
 ./usr/lkm/cd9660.o				base-vfs-lkm
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 58aa678adade..2e42f0532450 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.744 2008/04/15 11:17:47 plunky Exp $
+# $NetBSD: mi,v 1.745 2008/05/02 23:12:00 ad Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -113,6 +113,8 @@
 ./etc/ssh					base-sys-root
 ./etc/systrace					base-util-root		obsolete
 ./etc/uucp					base-obsolete		obsolete
+./kernel					base-sys-root
+./kernel/modules				base-sys-root
 ./lib						base-sys-root
 ./lib/libdes.so					base-obsolete		obsolete
 ./lib/libssp.so					base-obsolete		obsolete
diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist
index 12b5c55e421a..aa5e2228b8e4 100644
--- a/etc/mtree/NetBSD.dist
+++ b/etc/mtree/NetBSD.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist,v 1.363 2008/05/01 15:32:46 jmmv Exp $
+#	$NetBSD: NetBSD.dist,v 1.364 2008/05/02 23:12:01 ad Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -51,6 +51,8 @@
 ./etc/skel
 ./etc/sliphome
 ./etc/ssh
+./kernel
+./kernel/modules
 ./lib
 ./libdata
 ./libdata/firmware
diff --git a/share/mk/bsd.kmodule.mk b/share/mk/bsd.kmodule.mk
index 104498bd422a..219f2fa9f734 100644
--- a/share/mk/bsd.kmodule.mk
+++ b/share/mk/bsd.kmodule.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmodule.mk,v 1.1 2008/05/02 14:20:50 ad Exp $
+#	$NetBSD: bsd.kmodule.mk,v 1.2 2008/05/02 23:12:01 ad Exp $
 
 .include <bsd.init.mk>
 .include <bsd.klinks.mk>
@@ -76,7 +76,8 @@ ${PROG}: ${OBJS} ${DPADD}
 
 ##### Install rules
 .if !target(kmodinstall)
-_PROG:=		${DESTDIR}${KMODDIR}/${PROG}		# installed path
+KMODINSTDIR=	${DESTDIR}${KMODULEDIR}/${KMOD}
+_PROG:=		${KMODINSTDIR}/${PROG} # installed path
 
 .if ${MKUPDATE} == "no"
 ${_PROG}! ${PROG}					# install rule
@@ -90,6 +91,7 @@ ${_PROG}:	.MADE					# no build at install
 .endif
 .endif
 	${_MKTARGET_INSTALL}
+	${INSTALL_DIR} ${KMODINSTDIR}
 	${INSTALL_FILE} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
 		${.ALLSRC} ${.TARGET}
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 815ddc632939..51a5d3d0e0f3 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.507 2008/05/02 11:45:19 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.508 2008/05/02 23:12:01 ad Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -355,6 +355,11 @@ KMODGRP?=	wheel
 KMODOWN?=	root
 KMODMODE?=	${NONBINMODE}
 
+KMODULEDIR?=	/kernel/modules
+KMODULEGRP?=	wheel
+KMODULEOWN?=	root
+KMODULEMODE?=	${NONBINMODE}
+
 LOCALEDIR?=	/usr/share/locale
 LOCALEGRP?=	wheel
 LOCALEOWN?=	root
diff --git a/sys/Makefile b/sys/Makefile
index 8764bbca085a..3e9cd0eac6f0 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.65 2007/09/24 14:19:36 pooka Exp $
+#	$NetBSD: Makefile,v 1.66 2008/05/02 23:12:01 ad Exp $
 
 SUBDIR=	altq arch compat dev fs miscfs \
 	net net80211 netatalk netbt netipsec netinet netinet6 \
@@ -11,7 +11,7 @@ SUBDIR+=	rump
 .endif
 
 .if (${MACHINE} != "evbppc")
-SUBDIR+=lkm
+SUBDIR+=lkm modules
 .endif
 
 # Speedup stubs for some subtrees that don't need to run these rules
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
new file mode 100644
index 000000000000..7aed3be2779a
--- /dev/null
+++ b/sys/modules/Makefile
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2008/05/02 23:12:01 ad Exp $
+
+SUBDIR=	miniroot
+
+.include <bsd.subdir.mk>