diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index fca907531..a0e2a6df9 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,4 +1,11 @@
-2001-01-02  Pavel Roskin  <proski@gnu.org>
+2002-01-11  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* Makefile.am (AM_CFLAGS): Add -DCONFIGDIR=\""@configdir@"\"
+	if smbfs support is enabled.
+
+	* smbfs.c (smbfs_init): Use CONFIGDIR for smb.conf.
+
+2002-01-02  Pavel Roskin  <proski@gnu.org>
 
 	* Makefile.am: Add *clean-local targets to take care of the
 	samba directory.
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index d0ef69a26..f54f3582b 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = extfs
 
+if USE_SAMBA_FS
+AM_CFLAGS = $(GLIB_CFLAGS) -DCONFIGDIR=\""@configdir@"\"
+else
 AM_CFLAGS = $(GLIB_CFLAGS)
+endif
 
 BASICFILES = 			\
 	cpio.c			\
diff --git a/vfs/smbfs.c b/vfs/smbfs.c
index edaa61ab9..478cdcbce 100644
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@ -250,7 +250,7 @@ smbfs_set_debug(int arg)
 static int
 smbfs_init(vfs *me)
 {
-	char *servicesf = "/etc/smb.conf";
+	char *servicesf = CONFIGDIR "/smb.conf";
 
 /*	DEBUGLEVEL = 4;	*/