diff --git a/Makefile.am b/Makefile.am
index f30b1246ba..4c3b034015 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,21 +9,21 @@ SUBDIRS = RSAEuro db lib api apps client sched tools test py
 
 EXTRA_DIST =								\
 	mac_build win_build						\
-	doc html_ops html_user						\
+	doc								\
 	stripchart							\
         INSTALL
 
-py html_user html_ops:
-	[ "$srcdir" != . ] && ln -s $srcdir/$@ $@
+py:
+	[ "$(srcdir)" != . ] && rm -f $@ && $(LN_S) $(srcdir)/$@ $@
 
-all-local: html_user html_ops
+UNIX2DOS=unix2dos
+UNIX2DOSDIR = /disks/philmor/a/users/quarl/bin
 
 UNIX2DOS = /disks/philmor/a/users/quarl/bin/unix2dos
 
 dist-hook:
-	rm -rf `find $(distdir) -name CVS -prune`
-	rm -rf `find $(distdir) -name .backup -prune -o -name *~`
-	cd $(distdir)/win_build && $(UNIX2DOS) boinc.dsw *.dsp
+	rm -rf `find $(distdir) -name .backup -prune -o -name '*~'`
+	PATH=$PATH:$UNIX2DOSDIR cd $(distdir)/win_build && $(UNIX2DOS) boinc.dsw *.dsp
 
 client-bin:
 	cd client && make client-bin client-bin-gz