diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index a468d7afd..4ca2b2a81 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,10 @@
 2002-07-02  Pavel Roskin  <proski@gnu.org>
 
+	* Makefile.am: Add samba to SUBDIRS.  Forcedly set DISTDIRS to
+	extfs.  Remove parts that are now handled by samba/Makefile.
+	* samba/Makefile.in: Add more empty targets for Automake
+	compatibility.
+
 	* ftpfs.c (send_ftp_command): Use "anonymous@" as default
 	anonymous password.
 	From Eduardo Perez Ureta" <eperez@it.uc3m.es>
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index 8579371e9..40558f105 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -1,4 +1,10 @@
+if USE_SAMBA_FS
+SUBDIRS = samba extfs
+else
 SUBDIRS = extfs
+endif
+
+DIST_SUBDIRS = extfs
 
 if USE_SAMBA_FS
 AM_CFLAGS = $(GLIB_CFLAGS) -DCONFIGDIR=\""@configdir@"\"
@@ -49,12 +55,12 @@ EXTRA_DIST = ChangeLog README README.fish \
 	$(VFSHDRS) $(BASICFILES) $(NETFILES) $(SMBFILES) $(UNDELFILES)
 
 dist-hook:
-	mkdir $(distdir)/samba
-	mkdir $(distdir)/samba/include
-	mkdir $(distdir)/samba/lib
-	mkdir $(distdir)/samba/libsmb
-	mkdir $(distdir)/samba/param
-	mkdir $(distdir)/samba/tests
+	$(mkinstalldirs) $(distdir)/samba
+	$(mkinstalldirs) $(distdir)/samba/include
+	$(mkinstalldirs) $(distdir)/samba/lib
+	$(mkinstalldirs) $(distdir)/samba/libsmb
+	$(mkinstalldirs) $(distdir)/samba/param
+	$(mkinstalldirs) $(distdir)/samba/tests
 	for I in $(SAMBA_DIST); do \
 	  cp -p $(srcdir)/samba/$$I $(distdir)/samba/$$I || exit 1; \
 	done
@@ -75,11 +81,7 @@ distclean-local:
 	else :; fi
 
 if USE_VFS
-if USE_SAMBA_FS
-noinst_LIBRARIES = libvfs-mc.a samba/libsamba.a
-else
 noinst_LIBRARIES = libvfs-mc.a
-endif
 else
 noinst_LIBRARIES =
 endif
@@ -90,8 +92,6 @@ else
 libvfs_mc_a_SOURCES = $(NONETFILES)
 endif
 
-samba_libsamba_a_SOURCES =
-
 if MCSERV_INSTALL
 sbin_PROGRAMS = mcserv
 else
@@ -104,9 +104,6 @@ mcserv_SOURCES = mcserv.c tcputil.c
 
 mcserv_LDFLAGS = $(SHADOWLIB) $(TERMNET) $(PAMLIBS) $(LCRYPT)
 
-samba/libsamba.a:
-	cd samba && $(MAKE) libsamba.a
-
 SAMBA_DIST =			\
 	Makefile.in		\
 	aclocal.m4		\
diff --git a/vfs/samba/Makefile.in b/vfs/samba/Makefile.in
index 3e805c3af..f6f250ae4 100644
--- a/vfs/samba/Makefile.in
+++ b/vfs/samba/Makefile.in
@@ -139,10 +139,6 @@ libsamba.a: $(SAMBAFILES)
 	  -o $@
 @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
 
-install:
-
-uninstall:
-
 etags:
 	etags `find . -name "*.[ch]"`
 
@@ -206,3 +202,11 @@ $(srcdir)/include/config.h.in: $(srcdir)/include/stamp-h.in
 $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/configure.in
 	cd $(srcdir) && $(AUTOHEADER)
 	@date -u > $@
+
+# Added for compatibility with Automake-generated makefiles
+distdir:
+dvi:
+check:
+install:
+installcheck:
+uninstall: