diff --git a/Makefile.in b/Makefile.in
index 0a582d4c7..d589f5db7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,17 +99,12 @@ distclean:
 	rm -f vfs/extfs/{ftplist,uzip,uzoo,lslR,ulha,ucpio,deb,urar,uar}
 	rm -f $(srcdir)/config.log $(srcdir)/config.status 
 
-distdirs:
-	mkdir ../mc-$(VERSION); \
-	for I in $(alldirs) extfs support support/xview_private; do \
-		mkdir ../mc-$(VERSION)/$$I; \
-	done
-
 distcopy:
 	sed -e "s/^%define ver .*/%define ver      $(VERSION)/; s/^%define rel .*/%define rel      1/" mc.spec > Specfile
+	mkdir ../mc-$(VERSION)
 	cp $(DISTMAIN) ../mc-$(VERSION);
-	-mkdir ../mc-$(VERSION)/intl
 	for I in $(alldirs); do \
+	    mkdir ../mc-$(VERSION)/$$I; \
 	    cd $$I ; \
 	    $(MAKE) distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \
 	    cd ..; done
@@ -120,6 +115,5 @@ distcopy:
 	(cd ..; tar cvf - mc-$(VERSION) | \
 	gzip -f9 > mc-$(VERSION).tar.gz)
 
-dist: configure config.h.in distdirs distcopy
-
+dist: configure config.h.in distcopy
 
diff --git a/edit/Makefile.in b/edit/Makefile.in
index b58cd5bf3..8fa090a3b 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -24,7 +24,7 @@ EDITSRC = edit.c editcmd.c editwidget.c edit_key_translator.c editdraw.c \
 EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \
 	  syntax.o editoptions.o
 
-DIST = 	Makefile.in README.edit $(EDITSRC)
+DIST = 	Makefile.in $(EDITSRC)
 
 all: @LIBEDIT_A@
 
diff --git a/gtkedit/Makefile.in b/gtkedit/Makefile.in
index f7087bb24..6c3dd72ec 100644
--- a/gtkedit/Makefile.in
+++ b/gtkedit/Makefile.in
@@ -21,14 +21,14 @@ AR = @AR@
 EDITSRC = edit.c editcmd.c editdraw.c \
 	editwidget.c gtkedit.c gtkeditkey.c \
 	mousemark.c propfont.c syntax.c wordproc.c \
-	config.h edit.h editcmddef.h global.h gtkedit.h \
-	libgettext.h lkeysym.h mousemark.h my_string.h
+	edit.h editcmddef.h global.h gtkedit.h \
+	libgettext.h lkeysym.h mousemark.h
 
 EDITOBJS = edit.o editcmd.o editdraw.o \
 	editwidget.o gtkedit.o gtkeditkey.o \
 	mousemark.o propfont.o syntax.o wordproc.o \
 
-DIST = 	Makefile.in README.edit $(EDITSRC)
+DIST = 	Makefile.in $(EDITSRC)
 
 all: libgtkedit.a
 
diff --git a/vfs/Make-mc.in b/vfs/Make-mc.in
index 1cdc3b5dd..bef061bed 100644
--- a/vfs/Make-mc.in
+++ b/vfs/Make-mc.in
@@ -24,7 +24,7 @@ NETFILES   = tcputil.o fish.o ftpfs.o mcfs.o utilvfs.o
 NONETFILES = local.o vfs.o tar.o sfs.o names.o container.o extfs.o \
 	@undelfs_o@
 
-VFSSRCS = local.c vfs.c mcfs.c tcputil.c tar.c sfs.c names.c shared.c \
+VFSSRCS = local.c vfs.c mcfs.c tcputil.c tar.c sfs.c names.c \
 	ftpfs.c container.c mcserv.c extfs.c undelfs.c utilvfs.c fish.c
 
 VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \
@@ -147,6 +147,7 @@ uninstall:
 
 distcopy:
 	$(CP) $(DISTVFS) ../../mc-$(VERSION)/vfs
+	mkdir ../../mc-$(VERSION)/vfs/extfs
 	cd extfs; $(CP) $(EXTFSSTUFF) ../../../mc-$(VERSION)/vfs/extfs
 
 depend dep: mcdep
diff --git a/xv/Makefile.in b/xv/Makefile.in
index a65824b8a..6d6d5e8c0 100644
--- a/xv/Makefile.in
+++ b/xv/Makefile.in
@@ -134,7 +134,10 @@ distclean: cleansourcelinks
 
 distcopy:
 	$(CP) $(DISTXV) ../../mc-$(VERSION)/xv
-	cd support/xview_private; $(CP) $(XVSUPPXVHDRS) ../../../../mc-$(VERSION)/xv/support/xview_private
+	mkdir ../../mc-$(VERSION)/xv/support
+	mkdir ../../mc-$(VERSION)/xv/support/xview_private
+	cd support/xview_private; $(CP) $(XVSUPPXVHDRS) \
+		../../../../mc-$(VERSION)/xv/support/xview_private
 
 install: install_@mxc@