diff --git a/ChangeLog b/ChangeLog
index 25b5c597c..26ce321f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-30  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Only configure in vfs/samba if smbfs support is
+	enabled.
+
 2001-01-13  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Don't create a faked malloc.h.
diff --git a/configure.in b/configure.in
index f460653c9..bbb9ab898 100644
--- a/configure.in
+++ b/configure.in
@@ -959,7 +959,9 @@ AC_SUBST(PCENTRULE)
 dnl
 dnl Output configuration files
 dnl
-AC_CONFIG_SUBDIRS(vfs/samba)
+if test "x$SAMBAFILES" != x; then
+  AC_CONFIG_SUBDIRS(vfs/samba)
+fi
 
 AC_OUTPUT([
 Make.common