diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 0b504bc69065..e17f6b76c83f 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -19,7 +19,7 @@ SUBDIR=	3dfx accf_data accf_http agp aha amr an aue \
 # XXX some of these can move to the general case when de-i386'ed
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=aac aic ar asr atspeaker bktr coff el fpu gnufpu ibcs2 linprocfs mly \
-	pecoff ray s3 splash sr streams vesa wi
+	pecoff ray s3 smbfs splash sr streams vesa wi
 .endif
 
 .if ${MACHINE} == "pc98"
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
new file mode 100644
index 000000000000..800a634747e8
--- /dev/null
+++ b/sys/modules/smbfs/Makefile
@@ -0,0 +1,62 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../crypto/des \
+	${.CURDIR}/../../kern \
+	${.CURDIR}/../../libkern \
+	${.CURDIR}/../../netsmb \
+	${.CURDIR}/../../fs/smbfs
+
+KMOD=	smbfs
+
+SRCS=	vnode_if.h \
+	opt_inet.h opt_ipx.h \
+	opt_netsmb.h opt_smbfs.h opt_vmpage.h \
+	iconv_converter_if.h \
+	md4c.c \
+	smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \
+	smb_usr.c smb_crypt.c smb_iod.c \
+	smbfs_vfsops.c smbfs_node.c smbfs_io.c smbfs_vnops.c \
+	smbfs_subr.c smbfs_smb.c
+
+NOMAN=true
+
+NETSMBCRYPTO=yes
+
+.if defined(NETSMBCRYPTO)
+SRCS+=	des_ecb.c des_setkey.c
+.endif
+
+# Build with IPX support (1|0)
+SMB_IPX?=	0
+
+# Build with INET support (1|0)
+SMB_INET?=	1
+
+CFLAGS+= ${KDEBUG}
+
+.if defined(VNPRINT)
+CFLAGS+= -DVNPRINT
+.endif
+
+opt_inet.h:
+	touch ${.TARGET}
+.if ${SMB_INET} > 0
+	echo "#define INET 1" > ${.TARGET}
+.endif
+
+opt_ipx.h:
+	touch ${.TARGET}
+.if ${SMB_IPX} > 0
+	echo "#define IPX 1" > ${.TARGET}
+.endif
+
+opt_netsmb.h:
+	echo "#define NETSMB	1"  > ${.TARGET}
+.if defined(NETSMBCRYPTO)
+	echo "#define NETSMBCRYPTO 1" >> ${.TARGET}
+.endif
+
+unload:
+	@(if kldunload ${KMOD}; then true; else true; fi)
+
+.include <bsd.kmod.mk>