diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 1e6037327202..aba76f623cc1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -360,7 +360,7 @@ SUBDIR=	\
 	snp \
 	sound \
 	${_speaker} \
-	spigen \
+	spi \
 	${_splash} \
 	${_sppp} \
 	ste \
diff --git a/sys/modules/spi/Makefile b/sys/modules/spi/Makefile
new file mode 100644
index 000000000000..b95fa53d82e4
--- /dev/null
+++ b/sys/modules/spi/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR = \
+	../spigen \
+	spibus \
+	
+.include <bsd.subdir.mk>
diff --git a/sys/modules/spi/spibus/Makefile b/sys/modules/spi/spibus/Makefile
new file mode 100644
index 000000000000..9fb858f0dc1d
--- /dev/null
+++ b/sys/modules/spi/spibus/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH:	${SRCTOP}/sys/dev/spibus
+
+KMOD=	spibus
+SRCS=	spibus.c
+
+.if !empty(OPT_FDT)
+SRCS+=	ofw_spibus.c
+.endif
+
+# Generated files...
+SRCS+=	\
+	bus_if.h \
+	device_if.h \
+	spibus_if.c \
+	spibus_if.h \
+
+.include <bsd.kmod.mk>