diff --git a/MAINTAINERS b/MAINTAINERS
index a3f9786cc6fe4324faa9928e563ebe57692c739a..0d675a94d6306fc30ead31b7cab5fb88bf97ad3a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3314,8 +3314,8 @@ F:	Documentation/kdump/
 KERNEL AUTOMOUNTER (AUTOFS)
 M:	"H. Peter Anvin" <hpa@zytor.com>
 L:	autofs@linux.kernel.org
-S:	Odd Fixes
-F:	fs/autofs/
+S:	Obsolete
+F:	drivers/staging/autofs/
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:	Ian Kent <raven@themaw.net>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e8edba7b56233f2c4a5f36a1a892c9197f49f834..01503536e457ea059fcb807293091a8fa0268ac5 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -87,6 +87,8 @@ source "drivers/staging/dream/Kconfig"
 
 source "drivers/staging/pohmelfs/Kconfig"
 
+source "drivers/staging/autofs/Kconfig"
+
 source "drivers/staging/phison/Kconfig"
 
 source "drivers/staging/line6/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d8eeea4e63ae0b37ff45ec6e110c59be7a0518e6..de5c0e5a99edeb467f23a09763d02817e68ba566 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_SPECTRA)		+= spectra/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_DREAM)		+= dream/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
+obj-$(CONFIG_AUTOFS_FS)		+= autofs/
 obj-$(CONFIG_IDE_PHISON)	+= phison/
 obj-$(CONFIG_LINE6_USB)		+= line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/
diff --git a/fs/autofs/Kconfig b/drivers/staging/autofs/Kconfig
similarity index 100%
rename from fs/autofs/Kconfig
rename to drivers/staging/autofs/Kconfig
diff --git a/fs/autofs/Makefile b/drivers/staging/autofs/Makefile
similarity index 100%
rename from fs/autofs/Makefile
rename to drivers/staging/autofs/Makefile
diff --git a/fs/autofs/autofs_i.h b/drivers/staging/autofs/autofs_i.h
similarity index 99%
rename from fs/autofs/autofs_i.h
rename to drivers/staging/autofs/autofs_i.h
index 901a3e67ec4578665812eebf07b40a7a8ede2632..647a14356e39b91850ae1161a21aeeaf1a5fa81a 100644
--- a/fs/autofs/autofs_i.h
+++ b/drivers/staging/autofs/autofs_i.h
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- ------------------------------------------------------- *
  *   
- * linux/fs/autofs/autofs_i.h
+ * drivers/staging/autofs/autofs_i.h
  *
  *   Copyright 1997-1998 Transmeta Corporation - All Rights Reserved
  *
diff --git a/fs/autofs/dirhash.c b/drivers/staging/autofs/dirhash.c
similarity index 99%
rename from fs/autofs/dirhash.c
rename to drivers/staging/autofs/dirhash.c
index e947915109e5aac39392c8863433c7f2bf903857..8f3e2b816129324730ffc3b80cea8be75110bd62 100644
--- a/fs/autofs/dirhash.c
+++ b/drivers/staging/autofs/dirhash.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/dirhash.c
+ * drivers/staging/autofs/dirhash.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/autofs/init.c b/drivers/staging/autofs/init.c
similarity index 97%
rename from fs/autofs/init.c
rename to drivers/staging/autofs/init.c
index cea5219b4f377ba00b3deb95f58455986764d676..765c72f42976ef9d30440d59814b568cb4fd5c1f 100644
--- a/fs/autofs/init.c
+++ b/drivers/staging/autofs/init.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/init.c
+ * drivers/staging/autofs/init.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/autofs/inode.c b/drivers/staging/autofs/inode.c
similarity index 99%
rename from fs/autofs/inode.c
rename to drivers/staging/autofs/inode.c
index e1734f2d6e26de60a89e514ac59d57a7a5fba821..74db190ae845821b8700bdc15df35712c12a2a74 100644
--- a/fs/autofs/inode.c
+++ b/drivers/staging/autofs/inode.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/inode.c
+ * drivers/staging/autofs/inode.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/autofs/root.c b/drivers/staging/autofs/root.c
similarity index 99%
rename from fs/autofs/root.c
rename to drivers/staging/autofs/root.c
index 11b1ea786d006472cc93cd0f33e6f787445ef569..70210aa0692ac9d4ae8a5018b7e368ca72812966 100644
--- a/fs/autofs/root.c
+++ b/drivers/staging/autofs/root.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/root.c
+ * drivers/staging/autofs/root.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/autofs/symlink.c b/drivers/staging/autofs/symlink.c
similarity index 95%
rename from fs/autofs/symlink.c
rename to drivers/staging/autofs/symlink.c
index 7ce9cb2c9ce21f74db531eef41d5df420feca5af..ff2c65cde753b98c0385879d6b7182d1bc459273 100644
--- a/fs/autofs/symlink.c
+++ b/drivers/staging/autofs/symlink.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/symlink.c
+ * drivers/staging/autofs/symlink.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/autofs/waitq.c b/drivers/staging/autofs/waitq.c
similarity index 99%
rename from fs/autofs/waitq.c
rename to drivers/staging/autofs/waitq.c
index be46805972f0b9fc589f6d4dfae59e703f9413cb..d3c8cc9eb4d17d601b7e91ba560bf645d2538d8a 100644
--- a/fs/autofs/waitq.c
+++ b/drivers/staging/autofs/waitq.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- --------------------------------------------------------- *
  *
- * linux/fs/autofs/waitq.c
+ * drivers/staging/autofs/waitq.c
  *
  *  Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved
  *
diff --git a/fs/Kconfig b/fs/Kconfig
index 3d185308ec883bd0c06be0d151385c65e15b3353..30da8ee16a963620063c69780ea99b0943924e04 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -59,7 +59,6 @@ source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"
 
-source "fs/autofs/Kconfig"
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
diff --git a/fs/Makefile b/fs/Makefile
index e6ec1d309b1d2ba43dd3e036a9f8dcfba9a757a1..e571feddd7b77b400ef582688908495233ed3b51 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -104,7 +104,6 @@ obj-$(CONFIG_UBIFS_FS)		+= ubifs/
 obj-$(CONFIG_AFFS_FS)		+= affs/
 obj-$(CONFIG_ROMFS_FS)		+= romfs/
 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/