diff --git a/ChangeLog b/ChangeLog
index ec7236620..522941a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-09-13  Pavel Roskin  <proski@gnu.org>
 
+	* acinclude.m4: Replace smbfs and SAMBAFILES variables with
+	use_smbfs.
+	* configure.in: Likewise.
+	* INSTALL: Document --with-samba.
+
 	* configure.in: Roll --enable-mcserv-install into ...
 	* acinclude.m4: ... --with-mcfs.  Adjust makefiles.
 	* INSTALL: Document --with-mcfs.
diff --git a/INSTALL b/INSTALL
index 5f51834e6..0bec3a995 100644
--- a/INSTALL
+++ b/INSTALL
@@ -139,6 +139,13 @@ the directory base where you installed the gpm package.
      implementation of mcfs is not optimized for speed.  There may be
      security issues with mcserv - don't run it if you don't need it.
 
+`--with-samba'
+     This option enables remote VFS over the SMB protocol.  A stripped
+     down version of samba distibuted with the sources is compiled and
+     linked with the mc executable.  It is recommended that you install
+     Samba client, since mc uses some files from Samba under certain
+     conditions.  Please visit http://www.samba.org/ to learn more.
+
 `--disable-largefile'
      This option disables support for large files (2 gigabytes and more)
      on the systems where file operations use 32-bit offsets by default,
diff --git a/acinclude.m4 b/acinclude.m4
index b31ef7965..bf76952cd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -109,21 +109,17 @@ AC_DEFUN([MC_WITH_VFS],[
   dnl
   dnl Samba support
   dnl
-  smbfs=""
-  SAMBAFILES=""
+  use_smbfs=
   AC_ARG_WITH(samba,
   	  [  --with-samba             Support smb virtual file system [[no]]],
 	  [if test "x$withval" != "xno"; then
   		  AC_DEFINE(WITH_SMBFS, 1, [Define to enable VFS over SMB])
 	          vfs_flags="$vfs_flags, smbfs"
-		  smbfs="smbfs.o"
-		  SAMBAFILES="\$(SAMBAFILES)"
+		  use_smbfs=yes
   	  fi
   ])
-  AC_SUBST(smbfs)
-  AC_SUBST(SAMBAFILES)
 
-  if test "x$smbfs" != x ; then
+  if test -n "$use_smbfs"; then
   #################################################
   # set Samba configuration directory location
   configdir="/etc"
diff --git a/configure.in b/configure.in
index bebd68bf5..02202e97f 100644
--- a/configure.in
+++ b/configure.in
@@ -650,7 +650,7 @@ dnl Version for the RedHat package, without dashes
 RH_VERSION=`echo $VERSION | sed 's/-//'`
 AC_SUBST(RH_VERSION)
 
-if test "x$SAMBAFILES" != x; then
+if test -n "$use_smbfs"; then
   AC_CONFIG_SUBDIRS([vfs/samba])
 fi
 
@@ -658,7 +658,7 @@ AM_CONDITIONAL(USE_EDIT, [test -n "$LIBEDIT_A"])
 AM_CONDITIONAL(USE_VFS, [test "x$use_vfs" = xyes])
 AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue])
 AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$undelfs_o"])
-AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$SAMBAFILES"])
+AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"])
 AM_CONDITIONAL(USE_MCFS, [test -n "$use_mcfs"])
 AM_CONDITIONAL(INCLUDED_SLANG,
 	       [test "x$slang_use_system_installed_lib" = xfalse])