diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 2007405751cc..44df77cf45f1 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -20,7 +20,6 @@ options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	TMPFS			# Efficient memory filesystem
 options 	FFS			# Berkeley Fast Filesystem
-options 	NANDFS			# NAND Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 64465baf4c77..66a385ddbe40 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -17,7 +17,6 @@ options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	FFS			# Berkeley Fast Filesystem
-options 	NANDFS			# NAND Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index b24a6d80a873..d7d161956ce4 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -19,7 +19,6 @@ options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	FFS			# Berkeley Fast Filesystem
-options 	NANDFS			# NAND Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index 318a7d0e3c68..b114c6e3e923 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -26,7 +26,6 @@ makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM		# Platform based SoC
-#options 	NANDFS			# NAND Filesystem
 #options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
diff --git a/sys/conf/options b/sys/conf/options
index 6caae9a0708c..ca0b94dfadbe 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -256,7 +256,6 @@ FDESCFS		opt_dontuse.h
 FFS		opt_dontuse.h
 FUSEFS		opt_dontuse.h
 MSDOSFS		opt_dontuse.h
-NANDFS		opt_dontuse.h
 NULLFS		opt_dontuse.h
 PROCFS		opt_dontuse.h
 PSEUDOFS	opt_dontuse.h
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 50aed68dbf40..cdefa98a32f6 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -28,7 +28,6 @@ COMM=	${SYS}/sys/vnode.h \
 	${SYS}/fs/fifofs/*.[ch] \
 	${SYS}/fs/fuse/*.[ch] \
 	${SYS}/fs/msdosfs/*.[ch] \
-	${SYS}/fs/nandfs/*.[ch] \
 	${SYS}/fs/nfs/*.[ch] \
 	${SYS}/fs/nfsclient/*.[ch] \
 	${SYS}/fs/nfsserver/*.[ch] \
@@ -82,7 +81,6 @@ COMMDIR2= ${SYS}/dev/alc \
 	${SYS}/fs/fifofs \
 	${SYS}/fs/fuse \
 	${SYS}/fs/msdosfs \
-	${SYS}/fs/nandfs \
 	${SYS}/fs/nfs \
 	${SYS}/fs/nfsclient \
 	${SYS}/fs/nfsserver \