diff --git a/Makefile b/Makefile
index 7e132f6..9ca7c24 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-VERSION=4.1
+VERSION=4.2
 TAGVERSION=$(shell echo $(VERSION) | sed 's/\./_/g')
 TARBALL=UMLGraph-$(VERSION).tar.gz
 ZIPBALL=UMLGraph-$(VERSION).zip
@@ -47,13 +47,14 @@ $(TARBALL): $(JARFILE) docs Makefile
 	cp $(JARFILE) $(DISTDIR)/lib
 	cp $(WEBDIR)/doc/* $(DISTDIR)/doc
 	cp build.xml $(DISTDIR)
-	tar cf - src testdata/{java,dot-ref} --exclude='*/RCS' | tar -C $(DISTDIR) -xvf -
+	tar cf - src testdata/{java,dot-ref} javadoc --exclude='*/RCS' | tar -C $(DISTDIR) -xvf -
 	$(LF) $(PICFILE) >$(DISTDIR)/src/$(PICFILE)
 	tar cvf - $(DISTDIR) | gzip -c >$(TARBALL)
 	zip -r $(ZIPBALL) $(DISTDIR)
 
 docs:
 	(cd doc && make)
+	ant javadocs
 
 $(JARFILE): $(DOCLETSRC)
 	ant compile
@@ -64,6 +65,7 @@ test:
 web: $(TARBALL) CHECKSUM.MD5
 	cp $(TARBALL) $(ZIPBALL) CHECKSUM.MD5 $(WEBDIR)
 	cp $(JARFILE) $(WEBDIR)/jars/UmlGraph-$(VERSION).jar
+	tar cf - javadoc | tar -C $(WEBDIR) -xvf -
 	sed "s/VERSION/$(VERSION)/g" index.html >$(WEBDIR)/index.html
 
 CHECKSUM.MD5: $(TARBALL) $(JARFILE)
diff --git a/doc/ver.xml b/doc/ver.xml
index ee2ec56..e3a79b4 100644
--- a/doc/ver.xml
+++ b/doc/ver.xml
@@ -7,6 +7,7 @@
 <ul>
 <li> Correct the handling of qualified class names following
 the extends keyword (Arnaud Rogues).</li>
+<li> Javadoc documentation (Andrea Aime).</li>
 </ul>
 
 <dt>Version 4.1 2005/11/15</dt><dd>
diff --git a/index.html b/index.html
index d848c27..61d4a38 100644
--- a/index.html
+++ b/index.html
@@ -122,12 +122,15 @@ and the complete documentation in HTML format).
 (zip file containing the source code, the compiled doclet,
 and the complete documentation in HTML format).
 </li>
-<li> <a href="doc/index.html">Documentation</a>
+<li> <a href="doc/index.html">User documentation</a>
 (table of contents - suitable for web browsing).
 </li>
-<li> <a href="doc/indexw.html">Printable documentation</a>
+<li> <a href="doc/indexw.html">Printable user documentation</a>
 (the above as a single printable page).
 </li>
+<li> <a href="javadoc/index.html">Doclet technical documentation</a>
+(javadoc table of contents).
+</li>
 <li> <a href="doc/ver.html">Version history</a> </li>
 <li> <a href="http://freshmeat.net/projects/umlgraph/">freshmeat.net page</a> (use it to subscribe and post comments).</li>
 <li> <a href="UMLGraph-2.10.tar.gz">UmlGraph package version 2.10 - .tar.gz</a>
diff --git a/web/index.html b/web/index.html
index d848c27..61d4a38 100644
--- a/web/index.html
+++ b/web/index.html
@@ -122,12 +122,15 @@ and the complete documentation in HTML format).
 (zip file containing the source code, the compiled doclet,
 and the complete documentation in HTML format).
 </li>
-<li> <a href="doc/index.html">Documentation</a>
+<li> <a href="doc/index.html">User documentation</a>
 (table of contents - suitable for web browsing).
 </li>
-<li> <a href="doc/indexw.html">Printable documentation</a>
+<li> <a href="doc/indexw.html">Printable user documentation</a>
 (the above as a single printable page).
 </li>
+<li> <a href="javadoc/index.html">Doclet technical documentation</a>
+(javadoc table of contents).
+</li>
 <li> <a href="doc/ver.html">Version history</a> </li>
 <li> <a href="http://freshmeat.net/projects/umlgraph/">freshmeat.net page</a> (use it to subscribe and post comments).</li>
 <li> <a href="UMLGraph-2.10.tar.gz">UmlGraph package version 2.10 - .tar.gz</a>