3 files changed, 21 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c9a86d0685a..f038dca34ee8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,13 @@ L:	linux-tape@vger.kernel.org
 W:      http://sourceforge.net/projects/ftape
 S:      Orphan
 
+FUSE: FILESYSTEM IN USERSPACE
+P:      Miklos Szeredi
+M:      miklos@szeredi.hu
+L:      fuse-devel@lists.sourceforge.net
+W:      http://fuse.sourceforge.net/
+S:      Maintained
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 P:      Rik Faith
 M:      faith@cs.unc.edu
diff --git a/fs/Kconfig b/fs/Kconfig
index 443aed4e2067..068ccea2f184 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -462,6 +462,19 @@ config AUTOFS4_FS
           local network, you probably do not need an automounter, and can say
           N here.
 
+config FUSE_FS
+        tristate "Filesystem in Userspace support"
+        help
+          With FUSE it is possible to implement a fully functional filesystem
+          in a userspace program.
+
+          There's also companion library: libfuse.  This library along with
+          utilities is available from the FUSE homepage:
+          <http://fuse.sourceforge.net/>
+
+          If you want to develop a userspace FS, or if you want to use
+          a filesystem based on FUSE, answer Y or M.
+
 menu "CD-ROM/DVD Filesystems"
 
 config ISO9660_FS
diff --git a/fs/Makefile b/fs/Makefile
index d646502c1efb..1972da186272 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_QNX4FS_FS)		+= qnx4/
 obj-$(CONFIG_AUTOFS_FS)         += autofs/
 obj-$(CONFIG_AUTOFS4_FS)        += autofs4/
 obj-$(CONFIG_ADFS_FS)           += adfs/
+obj-$(CONFIG_FUSE_FS)           += fuse/
 obj-$(CONFIG_UDF_FS)            += udf/
 obj-$(CONFIG_RELAYFS_FS)        += relayfs/
 obj-$(CONFIG_SUN_OPENPROMFS)    += openpromfs/