diff --git a/Makefile b/Makefile
index e241f6c..ad29d69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,43 @@
 SHELL = /bin/sh
 
-version_id = 1.0
+version_id = 2.0
 
-TEMPDIR = /tmp
+distname = sunet-$(version_id)
 
-sunet_files = Readme \
-	cgi-script.scm \
-	cgi-server.scm \
-	conditionals.scm \
-	crlf-io.scm \
-	htmlout.scm \
-	http-top.scm \
-	httpd/access-control.scm \
-	httpd/core.scm \
-	httpd/error.scm \
-	httpd/handlers.scm \
-	info-gateway.scm \
-	rman-gateway.scm \
-	modules.scm \
-	parse-forms.scm \
-	program-modules.scm \
-	rfc822.scm \
-	scheme-program-server.scm \
-	server.scm \
-	seval.scm \
-	smtp.scm \
-	stringhax.scm \
-	su-httpd.txt \
-	toothless.scm \
-	uri.scm \
-	url.scm
+distdir = /tmp
+
+DISTFILES = COPYING README \
+	    Makefile packages.scm \
+	    start-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
+
+sunet-$(version_id).tar.gz:
+
+.PHONY: dist
+
+dist:
+	cd doc/latex && $(MAKE) html
+	cd doc/latex && $(MAKE) man.pdf && cp -p man.pdf ..
+	distname=$(distname) &&						\
+	distfile=$(distdir)/$$distname.tar.gz &&			\
+	if [ -d $(distdir) ] &&						\
+	   [ -w $$distfile -o -w $(distdir) ]; then			\
+		rm -f $$distname &&					\
+		ln -s . $$distname &&					\
+		files='' &&						\
+		for i in $(DISTFILES); do				\
+			if [ "$$i" != "c/sysdep.h" ]; then		\
+				files="$$files $$distname/$$i";		\
+			fi						\
+		done &&							\
+		tar --exclude CVS -cf - $$files |					\
+			gzip --best >$$distfile &&			\
+		rm $$distname;						\
+	else								\
+		echo "Can't write $$distfile" >&2;			\
+		exit 1;							\
+	fi
 
 
-sunet-$(version_id).tar.gz: $(sunet_files)
-	sunet_root=`pwd`; \
-	mkdir $(TEMPDIR)/sunet-$(version_id); \
-	cp $(sunet_files) $(TEMPDIR)/sunet-$(version_id); \
-	cd $(TEMPDIR); \
-	tar czf sunet-$(version_id).tar.gz sunet-$(version_id); \
-	mv sunet-$(version_id).tar.gz $$sunet_root; \
-	rm -rf sunet-$(version_id)
-
-.PHONY: tags
-tags:
-	find . -name "*.scm" | etags -
-