diff --git a/Makefile b/Makefile
index 4df2f9d..304fa28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,18 @@
 SHELL = /bin/sh
 
-version_id = 2.0
+version_id = 2.1
 
 distname = sunet-$(version_id)
 
 distdir = /tmp
 
 DISTFILES = COPYING README RELEASE \
-	    Makefile packages.scm \
+	    pkg-def.scm install-lib-module.scm install-lib.scm install-pkg \
+	    Makefile scheme/packages.scm \
 	    start-web-server \
-	    httpd/*.scm ftpd/*.scm lib/*.scm \
-	    doc/man.pdf doc/html \
+	    scheme/httpd/*.scm scheme/httpd/surflets/*.scm \
+	    scheme/ftpd/*.scm scheme/lib/*.scm \
+	    doc/pdf/sunet.pdf doc/html \
 	    doc/latex/*.tex doc/latex/*.sty doc/latex/*.t2p doc/latex/*.hdir \
 	    web-server
 
@@ -20,8 +22,11 @@ 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
+	cd doc/latex && $(MAKE) man.pdf  
+	cd web-server/root/htdocs
+	mkdir -p doc/pdf
+	cp doc/latex/man.pdf doc/pdf/sunet.pdf
+	mv doc/html/man.html doc/html/index.html	
 	distname=$(distname) &&						\
 	distfile=$(distdir)/$$distname.tar.gz &&			\
 	if [ -d $(distdir) ] &&						\
diff --git a/pkg-def.scm b/pkg-def.scm
new file mode 100644
index 0000000..a7505ff
--- /dev/null
+++ b/pkg-def.scm
@@ -0,0 +1,9 @@
+(define-package "sunet" (2 1) ()
+  (install-directory-contents "scheme" 'scheme)
+  (install-directory "web-server" 'misc-shared)
+  (install-directory-contents "doc" 'doc)
+  (let ((doc-dir (get-directory 'doc #t))
+        (misc-shared-dir (get-directory 'misc-shared #t)))
+    (create-symlink (string-append doc-dir "/html")
+                    (string-append misc-shared-dir "/web-server/root/htdocs/sunet-manual")))
+)