diff --git a/sys/conf/files b/sys/conf/files
index ba9bb8013467..6b926a540fe0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -847,9 +847,6 @@ dev/xe/if_xe_pccard.c		optional xe pccard
 dev/zs/zs.c			optional zs
 dev/zs/zs_sbus.c		optional zs fhc
 dev/zs/zs_sbus.c		optional zs sbus
-fs/autofs/autofs_vnops.c	optional autofs
-fs/autofs/autofs_vfsops.c	optional autofs
-fs/autofs/autofs_util.c		optional autofs
 fs/deadfs/dead_vnops.c	standard
 fs/devfs/devfs_devs.c		standard
 fs/devfs/devfs_rule.c		standard
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 280c222dbf9b..ccb394830ff2 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -27,7 +27,6 @@ SUBDIR=	${_3dfx} \
 	ath \
 	${_ath_hal} \
 	aue \
-	autofs \
 	${_auxio} \
 	${_awi} \
 	axe \
diff --git a/sys/modules/autofs/Makefile b/sys/modules/autofs/Makefile
deleted file mode 100644
index 6d0a75208605..000000000000
--- a/sys/modules/autofs/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# $Id: Makefile,v 1.11 2004/09/08 08:12:21 bright Exp $
-
-
-SRCDIR=        ${.CURDIR}/../../fs/autofs
-
-.PATH: ${SRCDIR}
-
-CFLAGS+=	-I${SRCDIR}
-
-KMOD=	autofs
-
-SRCS=	vnode_if.h \
-	autofs_vfsops.c autofs_util.c autofs_vnops.c
-
-.include <bsd.kmod.mk>