diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 3b5c52ff4..33422c257 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-02  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (EXTRA_DIST): Distribute files that the
+	BUILT_SOURCES depend on.
+	(mad.c, mad.h): Don't use GNU make specific features in rule.
+	(libvfs_la_SOURCES): Update from Make-mc.in.
+
 1998-12-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* direntry.c (vfs_s_insert_super): This routine does not return
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index dcb921eae..64c3f0a4f 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -15,16 +15,41 @@ libvfsincludedir=$(includedir)/vfs
 
 libvfsinclude_HEADERS=vfs.h
 
+EXTRA_DIST = mc-src/mad.c mc-src/mad.h
+
 mad.c: mc-src/mad.c
-	$(LN_S) $< $@
+	$(LN_S) $(srcdir)/mc-src/mad.c mad.c
 
 mad.h: mc-src/mad.h
-	$(LN_S) $< $@
+	$(LN_S) $(srcdir)/mc-src/mad.h mad.h
 
-libvfs_la_SOURCES = callback.h container.c direntry.c container.h extfs.c \
-extfs.h ftpfs.c ftpfs.h fish.c fish.h local.c mad.c mad.h mcfs.c mcfs.h \
-mcserv.c names.c names.h shared_ftp_fish.c shared_tar_ext.c tar.c tar.h \
-sfs.c tcputil.c tcputil.h undelfs.c undelfs.h util-alone.c util-alone.h \
-utilvfs.c vfs.c vfs.h xdirentry.h
+libvfs_la_SOURCES = \
+	container.c 		\
+	direntry.c		\
+	extfs.c 		\
+	fish.c 			\
+	ftpfs.c 		\
+	local.c 		\
+	mcfs.c			\
+	mcserv.c 		\
+	names.c 		\
+	sfs.c 			\
+	shared_ftp_fish.c	\
+	shared_tar_ext.c 	\
+	tar.c 			\
+	tcputil.c		\
+	undelfs.c 		\
+	utilvfs.c		\
+	vfs.c			\
+	container.h 		\
+	extfs.h 		\
+	fish.h			\
+	ftpfs.h 		\
+	mcfs.h 			\
+	names.h 		\
+	tar.h 			\
+	tcputil.h 		\
+	vfs.h			\
+	xdirentry.h
 
 libvfs_la_LDFLAGS = -version-info 27:0:27