diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6fbae2748f00..6a337af5dd29 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -204,6 +204,7 @@ SUBDIR+=3dfx \
 SUBDIR+=aac \
 	acpi \
 	asr \
+	bios \
 	cardbus \
 	cbb \
 	ciss \
@@ -213,7 +214,6 @@ SUBDIR+=aac \
 	iir \
 	mly \
 	s3 \
-	smapi \
 	vesa
 	
 .elif ${MACHINE} == "pc98"
diff --git a/sys/modules/bios/Makefile b/sys/modules/bios/Makefile
new file mode 100644
index 000000000000..d150806c045d
--- /dev/null
+++ b/sys/modules/bios/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+#
+
+SUBDIR=	smapi smbios vpd
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/smapi/Makefile b/sys/modules/bios/smapi/Makefile
similarity index 71%
rename from sys/modules/smapi/Makefile
rename to sys/modules/bios/smapi/Makefile
index 3e2d77cacd98..30c9058dea2f 100644
--- a/sys/modules/smapi/Makefile
+++ b/sys/modules/bios/smapi/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
+#
 
-.PATH:  ${.CURDIR}/../../i386/bios
+.PATH:  ${.CURDIR}/../../../i386/bios
 
 KMOD=	smapi
 SRCS=	smapi.c smapi_bios.S \
diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile
new file mode 100644
index 000000000000..40df8e80db47
--- /dev/null
+++ b/sys/modules/bios/smbios/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+#
+
+.PATH:  ${.CURDIR}/../../../i386/bios
+
+KMOD=	smbios
+SRCS=	smbios.c \
+	bus_if.h device_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bios/vpd/Makefile b/sys/modules/bios/vpd/Makefile
new file mode 100644
index 000000000000..d1dd8f1d9215
--- /dev/null
+++ b/sys/modules/bios/vpd/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+#
+
+.PATH:  ${.CURDIR}/../../../i386/bios
+
+KMOD=	vpd
+SRCS=	vpd.c \
+	bus_if.h device_if.h
+
+.include <bsd.kmod.mk>