diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 774f90539..feb8f5a21 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-19  Andrew V. Samoilov  <sav@bcs.zp.ua>
+
+	* tcputil.c [!WITH_MCFS]: Disable mcfs related code.
+	* mcfs.c [!WITH_MCFS]: Disable all code.
+
 2002-09-16  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* smbfs.c: Don't define BOOL_DEFINED to fix compilation on
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index 05b5b6fd9..597eab214 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -24,6 +24,7 @@
 
 /* Namespace: exports mcfs_vfs_ops, tcp_invalidate_socket */
 
+#ifdef WITH_MCFS
 #include <config.h>
 #include <stdio.h>
 #include <errno.h>
@@ -59,7 +60,6 @@ static struct _mcfs_connection {
     int  version;
 } mcfs_connections [MCFS_MAX_CONNECTIONS];
 
-#ifdef WITH_MCFS
 
 #define mcserver_port 9876
 
@@ -1120,8 +1120,6 @@ vfs vfs_mcfs_ops = {
 MMAPNULL
 };
 
-#endif /* WITH_MCFS */
-
 
 /* FIXME: This part should go to another c module, perhaps tcp.c */
 
@@ -1162,3 +1160,5 @@ void tcp_invalidate_socket (int sock)
      mcfs_invalidate_socket (sock);
 }
 /* FIXME end: 'cause it is used not only by mcfs */
+
+#endif	/* WITH_MCFS */
diff --git a/vfs/tcputil.c b/vfs/tcputil.c
index ae6a8d977..0aa7b6483 100644
--- a/vfs/tcputil.c
+++ b/vfs/tcputil.c
@@ -56,6 +56,7 @@ extern void vfs_die (char *);
 
 int got_sigpipe;
 
+#ifdef	WITH_MCFS
 /* Reads a block on dest for len bytes from sock */
 /* Returns a boolean indicating the success status */
 int socket_read_block (int sock, char *dest, int len)
@@ -245,6 +246,7 @@ void rpc_add_get_callback (int sock, void (*cback)(int))
     new->link = sock_callbacks;
     sock_callbacks = new;
 }
+#endif	/* WITH_MCFS */
 
 static void sig_pipe (int unused)
 {
@@ -262,6 +264,7 @@ void tcp_init (void)
     sigaction (SIGPIPE, &sa, NULL);
 }
 
+#ifdef	WITH_MCFS
 int get_remote_port (struct sockaddr_in *sin, int *version)
 {
 #ifdef HAVE_PMAP_GETMAPS
@@ -289,5 +292,5 @@ int get_remote_port (struct sockaddr_in *sin, int *version)
     *version = 1;
     return mcserver_port;
 }
-
+#endif	/* WITH_MCFS */