diff --git a/src/cmd.c b/src/cmd.c
index 2548bfa1e..ab51e6b37 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1153,14 +1153,14 @@ nice_cd (const char *text, const char *xtext, const char *help,
 
 static const char *machine_str = N_(" Enter machine name (F1 for details): ");
 
-#ifdef WITH_MCFS
+#ifdef ENABLE_VFS_MCFS
 void netlink_cmd (void)
 {
     nice_cd (_(" Link to a remote machine "), _(machine_str),
 	     "[Network File System]", ":netlink_cmd: Link to a remote ",
 	     "/#mc:", 1);
 }
-#endif /* WITH_MCFS */
+#endif /* ENABLE_VFS_MCFS */
 
 void ftplink_cmd (void)
 {
diff --git a/src/main.c b/src/main.c
index 4237a16ea..67b901987 100644
--- a/src/main.c
+++ b/src/main.c
@@ -832,7 +832,7 @@ static menu_entry LeftMenu[] = {
     {' ', N_("&Encoding...    C-t"), NULL_HOTKEY, encoding_cmd},
 #ifdef USE_NETCODE
     {' ', "", NULL_HOTKEY, 0},
-#ifdef WITH_MCFS
+#ifdef ENABLE_VFS_MCFS
     {' ', N_("&Network link..."), NULL_HOTKEY, netlink_cmd},
 #endif
     {' ', N_("FT&P link..."), NULL_HOTKEY, ftplink_cmd},
@@ -858,7 +858,7 @@ static menu_entry RightMenu[] = {
     {' ', N_("&Encoding...    C-t"), NULL_HOTKEY, encoding_cmd},
 #ifdef USE_NETCODE
     {' ', "", NULL_HOTKEY, 0},
-#ifdef WITH_MCFS
+#ifdef ENABLE_VFS_MCFS
     {' ', N_("&Network link..."), NULL_HOTKEY, netlink_cmd},
 #endif
     {' ', N_("FT&P link..."), NULL_HOTKEY, ftplink_cmd},
diff --git a/src/textconf.c b/src/textconf.c
index c06fbb4c6..36c648436 100644
--- a/src/textconf.c
+++ b/src/textconf.c
@@ -40,7 +40,7 @@ static const char *const vfs_supported[] = {
 #ifdef USE_NETCODE
     "ftpfs",
     "fish",
-#   ifdef WITH_MCFS
+#   ifdef ENABLE_VFS_MCFS
     "mcfs",
 #   endif
 #   ifdef WITH_SMBFS
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index 40f65d6f5..e10e2333a 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#ifdef WITH_MCFS
+#ifdef ENABLE_VFS_MCFS
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -1261,4 +1261,4 @@ void mcfs__unused(void)
     CFLAGS="-ansi -pedantic -Wall -Wextra -Werror"
 */
 }
-#endif				/* WITH_MCFS */
+#endif				/* ENABLE_VFS_MCFS */
diff --git a/vfs/mcfsutil.c b/vfs/mcfsutil.c
index 7d1e96024..959d4b5e8 100644
--- a/vfs/mcfsutil.c
+++ b/vfs/mcfsutil.c
@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#ifdef	WITH_MCFS
+#ifdef	ENABLE_VFS_MCFS
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -218,4 +218,4 @@ void mcfsutil__unused(void)
     CFLAGS="-ansi -pedantic -Wall -Wextra -Werror"
 */
 }
-#endif				/* WITH_MCFS */
+#endif				/* ENABLE_VFS_MCFS */
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 9188a5544..18b581dd2 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -1220,9 +1220,9 @@ vfs_init (void)
 #ifdef WITH_SMBFS
     init_smbfs ();
 #endif /* WITH_SMBFS */
-#ifdef WITH_MCFS
+#ifdef ENABLE_VFS_MCFS
     init_mcfs ();
-#endif /* WITH_MCFS */
+#endif /* ENABLE_VFS_MCFS */
 #endif /* USE_NETCODE */
 
     vfs_setup_wd ();