diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 951f55398349..508488414136 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -72,6 +72,8 @@ SUBDIR=	\
 	${_ce} \
 	${_cfi} \
 	${_ciss} \
+	cloudabi \
+	${_cloudabi64} \
 	${_cm} \
 	${_cmx} \
 	${_coff} \
@@ -616,6 +618,7 @@ _x86bios=	x86bios
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
+_cloudabi64=	cloudabi64
 _ixl=		ixl
 _ixlv=		ixlv
 _linux64=	linux64
diff --git a/sys/modules/cloudabi/Makefile b/sys/modules/cloudabi/Makefile
new file mode 100644
index 000000000000..bba50362eab1
--- /dev/null
+++ b/sys/modules/cloudabi/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../compat/cloudabi
+
+KMOD=	cloudabi
+SRCS=	cloudabi_clock.c cloudabi_errno.c cloudabi_fd.c cloudabi_file.c \
+	cloudabi_futex.c cloudabi_mem.c cloudabi_proc.c cloudabi_random.c \
+	cloudabi_sock.c cloudabi_thread.c vnode_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cloudabi64/Makefile b/sys/modules/cloudabi64/Makefile
new file mode 100644
index 000000000000..1e1a058acc71
--- /dev/null
+++ b/sys/modules/cloudabi64/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../compat/cloudabi64
+.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/cloudabi64
+
+KMOD=	cloudabi64
+SRCS=	cloudabi64_fd.c cloudabi64_poll.c cloudabi64_sock.c \
+	cloudabi64_syscalls.c cloudabi64_sysent.c cloudabi64_sysvec.c \
+	cloudabi64_thread.c
+
+.include <bsd.kmod.mk>