diff --git a/lib/vfs/mc-vfs/Makefile.am b/lib/vfs/mc-vfs/Makefile.am
index 6cb5a411c..223305f84 100644
--- a/lib/vfs/mc-vfs/Makefile.am
+++ b/lib/vfs/mc-vfs/Makefile.am
@@ -5,7 +5,11 @@ endif
 
 DIST_SUBDIRS = extfs fish
 
-SUBDIRS   = extfs fish $(SAMBA_SUBDIRS)
+SUBDIRS = fish $(SAMBA_SUBDIRS)
+if ENABLE_VFS_EXTFS
+SUBDIRS += extfs
+endif
+
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(SAMBA_CFLAGS)
 
 AM_CPPFLAGS = -DLIBEXECDIR=\""$(libexecdir)/@PACKAGE@/"\"
@@ -15,8 +19,7 @@ BASICFILES = \
 	direntry.c xdirentry.h	\
 	utilvfs.c utilvfs.h	\
 	local.c local.h		\
-	gc.c gc.h		\
-	extfs.c
+	gc.c gc.h
 
 CPIOFILES = cpio.c
 TARFILES = tar.c
@@ -41,6 +44,9 @@ endif
 if ENABLE_VFS_SFS
 libvfs_mc_la_SOURCES += $(SFSFILES)
 endif
+if ENABLE_VFS_EXTFS
+libvfs_mc_la_SOURCES += $(EXTFSFILES)
+endif
 if ENABLE_VFS_UNDELFS
 libvfs_mc_la_SOURCES += $(UNDELFILES)
 endif
@@ -56,6 +62,7 @@ EXTRA_DIST = HACKING README \
 	$(CPIOFILES) \
 	$(TARFILES) \
 	$(SFSFILES) \
+	$(EXTFSFILES) \
 	$(UNDELFILES) \
 	$(NETFILES) \
 	$(SMBFILES)
diff --git a/lib/vfs/mc-vfs/vfs-impl.h b/lib/vfs/mc-vfs/vfs-impl.h
index bdb900508..d09b594aa 100644
--- a/lib/vfs/mc-vfs/vfs-impl.h
+++ b/lib/vfs/mc-vfs/vfs-impl.h
@@ -120,7 +120,9 @@ void init_tarfs (void);
 #ifdef ENABLE_VFS_SFS
 void init_sfs (void);
 #endif
+#ifdef ENABLE_VFS_EXTFS
 void init_extfs (void);
+#endif
 void init_fish (void);
 #ifdef ENABLE_VFS_UNDELFS
 void init_undelfs (void);
diff --git a/lib/vfs/mc-vfs/vfs.c b/lib/vfs/mc-vfs/vfs.c
index 517674076..f4ef3f72b 100644
--- a/lib/vfs/mc-vfs/vfs.c
+++ b/lib/vfs/mc-vfs/vfs.c
@@ -1333,7 +1333,6 @@ vfs_init (void)
     /* fallback value for vfs_get_class() */
     localfs_class = vfs_list;
 
-    init_extfs ();
 #ifdef ENABLE_VFS_CPIO
     init_cpiofs ();
 #endif /* ENABLE_VFS_CPIO */
@@ -1343,6 +1342,9 @@ vfs_init (void)
 #ifdef ENABLE_VFS_SFS
     init_sfs ();
 #endif /* ENABLE_VFS_SFS */
+#ifdef ENABLE_VFS_EXTFS
+    init_extfs ();
+#endif /* ENABLE_VFS_EXTFS */
 #ifdef ENABLE_VFS_UNDELFS
     init_undelfs ();
 #endif /* ENABLE_VFS_UNDELFS */
diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4
index dc2a28d17..46bd3d4ca 100644
--- a/m4.include/mc-vfs.m4
+++ b/m4.include/mc-vfs.m4
@@ -68,7 +68,6 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 
 	AC_MC_VFS_FTP
 	AC_MC_VFS_FISH
-	AC_MC_VFS_EXTFS
 	AC_MC_VFS_SAMBA
 
 	MC_WITH_VFS
@@ -77,12 +76,12 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
 	vfs_type="Plain OS filesystem"
 	AM_CONDITIONAL(ENABLE_VFS_FTP, [false])
 	AM_CONDITIONAL(ENABLE_VFS_FISH, [false])
-	AM_CONDITIONAL(ENABLE_VFS_EXTFS, [false])
     fi
 
     AC_MC_VFS_CPIOFS
     AC_MC_VFS_TARFS
     AC_MC_VFS_SFS
+    AC_MC_VFS_EXTFS
     AC_MC_VFS_UNDELFS
 
     AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
diff --git a/m4.include/vfs/mc-vfs-extfs.m4 b/m4.include/vfs/mc-vfs-extfs.m4
index 20c695e7c..58d0da062 100644
--- a/m4.include/vfs/mc-vfs-extfs.m4
+++ b/m4.include/vfs/mc-vfs-extfs.m4
@@ -23,8 +23,8 @@ dnl Enable Extfs (classic)
 AC_DEFUN([AC_MC_VFS_EXTFS],
 [
     AC_ARG_ENABLE([vfs-extfs],
-              [  --enable-vfs-extfs      Support for extfs [[yes]]])
-    if test x"$enable_vfs_extfs" != x"no"; then
+		    AC_HELP_STRING([--enable-vfs-extfs], [Support for extfs filesystem [[yes]]]))
+    if test "$enable_vfs" != "no" -a x"$enable_vfs_extfs" != x"no"; then
 	AC_MC_EXTFS_CHECKS
 	enable_vfs_extfs="yes"
 	AC_MC_VFS_ADDNAME([extfs])
diff --git a/src/textconf.c b/src/textconf.c
index d4a6c9b4b..bd4062a74 100644
--- a/src/textconf.c
+++ b/src/textconf.c
@@ -42,7 +42,9 @@ static const char *const vfs_supported[] = {
 #ifdef ENABLE_VFS_SFS
     "sfs",
 #endif
+#ifdef ENABLE_VFS_EXTFS
     "extfs",
+#endif
 #ifdef ENABLE_VFS_UNDELFS
     "undelfs",
 #endif