diff --git a/.cvsignore b/.cvsignore
index b9a6089..c418dcd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,6 @@
 build
 lib
 javadoc
+UMLGraph-snapshot
+UMLGraph-snapshot.tar.gz
+UMLGraph-snapshot.zip
diff --git a/Makefile b/Makefile
index 31269d6..f25ad38 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-VERSION=4.2
+VERSION?=4.2
 TAGVERSION=$(shell echo $(VERSION) | sed 's/\./_/g')
 TARBALL=UMLGraph-$(VERSION).tar.gz
 ZIPBALL=UMLGraph-$(VERSION).zip
@@ -25,7 +25,11 @@ OTHERSRC=index.html build.xml Makefile
 # Files to tag
 ALLTAG=$(DOCLETSRC) $(TESTSRC) $(PICFILE) $(README) $(OTHERSRC)
 # Documentation location (release)
-export DOC=doc
+ifeq ($(VERSION),snapshot)
+	DOC=snapshot-doc
+else
+	DOC=doc
+endif
 
 JARFILE=lib/UmlGraph.jar
 
@@ -47,7 +51,7 @@ $(TARBALL): $(JARFILE) docs Makefile
 	$(LF) $(README) >$(DISTDIR)/$(README)
 	$(LF) $(PICFILE) >$(DISTDIR)/lib/$(PICFILE)
 	cp $(JARFILE) $(DISTDIR)/lib
-	cp $(WEBDIR)/doc/* $(DISTDIR)/doc
+	cp $(WEBDIR)/$(DOC)/* $(DISTDIR)/doc
 	cp build.xml $(DISTDIR)
 	tar cf - src testdata/{java,dot-ref} javadoc --exclude='*/RCS' | tar -C $(DISTDIR) -xvf -
 	$(LF) $(PICFILE) >$(DISTDIR)/src/$(PICFILE)
@@ -55,7 +59,7 @@ $(TARBALL): $(JARFILE) docs Makefile
 	zip -r $(ZIPBALL) $(DISTDIR)
 
 docs:
-	(cd doc && make)
+	(cd doc && make DOC=$(DOC))
 	ant javadocs
 
 $(JARFILE): $(DOCLETSRC)
diff --git a/doc/Makefile b/doc/Makefile
index 4eef741..bde890d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -9,7 +9,7 @@ DESTDIR=/dds/pubs/web/home/sw/umlgraph
 THREAD=/dds/pubs/courses/intro/thread.pl
 GIF := $(shell sed -n 's/.*<img *src *= *"\([^.]*\.gif\)".*/\1/p' *.xml)
 XML := $(wildcard *.xml)
-DOC?=testdoc
+DOC?=doc
 
 .SUFFIXES:.java .dot .ps .gif .pic .eps .png