diff --git a/Makefile b/Makefile
index a911be2..6460c33 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,11 @@ distdir = /tmp
 
 DISTFILES = COPYING README RELEASE \
 	    Makefile packages.scm \
-	    start-web-server \
+	    start-web-server start-extended-web-server \
 	    httpd/*.scm ftpd/*.scm lib/*.scm \
 	    doc/man.pdf doc/html \
-	    doc/latex/*.tex doc/latex/*.sty doc/latex/*.t2p doc/latex/*.hdir
+	    doc/latex/*.tex doc/latex/*.sty doc/latex/*.t2p doc/latex/*.hdir \
+	    web-server
 
 sunet-$(version_id).tar.gz:
 
@@ -20,6 +21,7 @@ sunet-$(version_id).tar.gz:
 dist:
 	cd doc/latex && $(MAKE) html
 	cd doc/latex && $(MAKE) man.pdf && cp -p man.pdf ..
+	cd web-server/root/htdocs && ln -sf ../../../doc/html sunet-manual
 	distname=$(distname) &&						\
 	distfile=$(distdir)/$$distname.tar.gz &&			\
 	if [ -d $(distdir) ] &&						\
@@ -32,7 +34,7 @@ dist:
 				files="$$files $$distname/$$i";		\
 			fi						\
 		done &&							\
-		tar --exclude CVS -cf - $$files |					\
+		tar --exclude .cvsignore --exclude CVS -cf - $$files |	\
 			gzip --best >$$distfile &&			\
 		rm $$distname;						\
 	else								\