diff --git a/fs/Kconfig b/fs/Kconfig
index ea88335e690c..7fe811ecf595 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -122,10 +122,11 @@ endmenu
 endif # BLOCK
 
 if BLOCK
-menu "DOS/FAT/SDFAT/NT Filesystems"
+menu "DOS/FAT/EXFAT/SDFAT/NT Filesystems"
 
 source "fs/fat/Kconfig"
 source "fs/sdfat/Kconfig"
+source "fs/exfat/Kconfig"
 source "fs/ntfs/Kconfig"
 
 endmenu
diff --git a/fs/Makefile b/fs/Makefile
index ea3d43d85b79..4f1aa0a2dab5 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -79,6 +79,7 @@ obj-$(CONFIG_CODA_FS)		+= coda/
 obj-$(CONFIG_MINIX_FS)		+= minix/
 obj-$(CONFIG_FAT_FS)		+= fat/
 obj-$(CONFIG_SDFAT_FS)		+= sdfat/
+obj-$(CONFIG_EXFAT_FS)		+= exfat/
 obj-$(CONFIG_BFS_FS)		+= bfs/
 obj-$(CONFIG_ISO9660_FS)	+= isofs/
 obj-$(CONFIG_HFSPLUS_FS)	+= hfsplus/ # Before hfs to find wrapped HFS+
diff --git a/fs/exfat/Makefile b/fs/exfat/Makefile
index b1acf144466a..ed51926a4971 100644
--- a/fs/exfat/Makefile
+++ b/fs/exfat/Makefile
@@ -2,39 +2,7 @@
 #
 # Makefile for the linux exFAT filesystem support.
 #
-ifneq ($(KERNELRELEASE),)
 obj-$(CONFIG_EXFAT_FS) += exfat.o
 
 exfat-y	:= inode.o namei.o dir.o super.o fatent.o cache.o nls.o misc.o \
 	   file.o balloc.o
-else
-# Called from external kernel module build
-
-KERNELRELEASE	?= $(shell uname -r)
-KDIR	?= /lib/modules/${KERNELRELEASE}/build
-MDIR	?= /lib/modules/${KERNELRELEASE}
-PWD	:= $(shell pwd)
-
-export CONFIG_EXFAT_FS := m
-
-all:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-clean:
-	$(MAKE) -C $(KDIR) M=$(PWD) clean
-
-help:
-	$(MAKE) -C $(KDIR) M=$(PWD) help
-
-install: exfat.ko
-	rm -f ${MDIR}/kernel/fs/exfat/exfat.ko
-	install -m644 -b -D exfat.ko ${MDIR}/kernel/fs/exfat/exfat.ko
-	depmod -aq
-
-uninstall:
-	rm -rf ${MDIR}/kernel/fs/exfat
-	depmod -aq
-
-endif
-
-.PHONY : all clean install uninstall
diff --git a/fs/exfat/README.md b/fs/exfat/README.md
deleted file mode 100644
index cee3699ed9be..000000000000
--- a/fs/exfat/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-## exFAT filesystem 
-This is the exfat filesystem for support from the linux 4.1 kernel
-to the latest kernel. 
-
-## Installing as a stand-alone module
-
-Install prerequisite package for Fedora, RHEL:
-```
-	yum install kernel-devel-$(uname -r)
-```
-
-Build step:
-```
-	make
-	sudo make install
-```
-
-To load the driver manually, run this as root:
-```
-	modprobe exfat
-```
-
-
-## Installing as a part of the kernel
-
-1. Let's take [linux] as the path to your kernel source dir.
-```
-	cd [linux]
-	cp -ar exfat [linux]/fs/
-```
-
-2. edit [linux]/fs/Kconfig
-```
-	source "fs/fat/Kconfig"
-	+source "fs/exfat/Kconfig"
-	source "fs/ntfs/Kconfig"
-```
-
-3. edit [linux]/fs/Makefile
-```
-	obj-$(CONFIG_FAT_FS)          += fat/
-	+obj-$(CONFIG_EXFAT_FS)       += exfat/
-	obj-$(CONFIG_BFS_FS)          += bfs/
-```
-4. make menuconfig and set exfat
-```
-	File systems  --->
-		DOS/FAT/NT Filesystems  --->
-			<M> exFAT filesystem support
-			(utf8) Default iocharset for exFAT
-```
-
-build your kernel