diff --git a/ChangeLog b/ChangeLog
index 534409515..b8982517c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-11  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* acinclude.m4: New options for smbfs:
+	--with-configdir=DIR    Where the Samba configuration files are (/etc)
+	--with-codepagedir=DIR  Where the Samba codepage files are
+
 2002-01-11  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/xml.syntax: New file - hightlighting for XML.
diff --git a/acinclude.m4 b/acinclude.m4
index 049b38915..0943aceb2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -113,7 +113,40 @@ AC_DEFUN([MC_WITH_VFS],[
   ])
   AC_SUBST(smbfs)
   AC_SUBST(SAMBAFILES)
-  
+
+  if test "x$smbfs" != x ; then
+  #################################################
+  # set Samba configuration directory location
+  configdir="/etc"
+  AC_ARG_WITH(configdir,
+  [  --with-configdir=DIR     Where the Samba configuration files are (/etc)],
+  [ case "$withval" in
+    yes|no)
+    #
+    # Just in case anybody does it
+    #
+	AC_MSG_WARN([--with-configdir called without argument - will use default])
+    ;;
+    * )
+	configdir="$withval"
+    ;;
+  esac]
+  )
+  AC_SUBST(configdir)
+
+  AC_ARG_WITH(codepagedir,
+    [  --with-codepagedir=DIR   Where the Samba codepage files are],
+    [ case "$withval" in
+      yes|no)
+      #
+      # Just in case anybody does it
+      #
+	AC_MSG_WARN([--with-codepagedir called without argument - will use default])
+      ;;
+    esac]
+  )
+  fi
+
   dnl
   dnl The termnet support
   dnl