diff --git a/CHANGELOG b/CHANGELOG
index 22a55ec3512..93a8dbc6228 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 CHANGELOG
 ------------------------------------
 
-Changes in CVS
+20020805 Release
 ------------------------------------
 * Added --no3D option to cdk.applications.Viewer
 * Do not fail if bond order != integer, assume order=1
diff --git a/build.xml b/build.xml
index 2df162329c7..0bac4ad9b64 100755
--- a/build.xml
+++ b/build.xml
@@ -231,6 +231,8 @@
                 </jar>
         </target>
 
+        <target name="dist-all" depends="dist-core, dist-extra, dist-with-java3d, dist-libio, dist-cml" />
+
         <target name="dist" depends="dist-extra" />
 
         <target name="dist-with-java3d" depends="compile-with-java3d, dist-core">
@@ -377,15 +379,4 @@
                 </java>
         </target>
 
-    <target name="javadoc" depends="init">
-		<javadoc packagenames="org.openscience.cdk.*"
-			sourcepath="${src}"
-			defaultexcludes="yes"
-			destdir="doc/api"
-			author="true"
-			version="true"
-			use="true">
-			<classpath refid="project.class.path" />	
-		</javadoc>
-	</target>
 </project>
diff --git a/javadoc.xml b/javadoc.xml
index 360dfe06048..2b5fba65400 100755
--- a/javadoc.xml
+++ b/javadoc.xml
@@ -1,7 +1,8 @@
 <project name="CDK" default="docbook" basedir=".">
 
-    <property name="javadoc.dir" value="doc.api" />
+    <property name="javadoc.dir" value="doc/api" />
     <property name="pathtojava3d" value="" />
+    <property name="src" value="src" />
 
     <path id="project.class.path">
         <pathelement location="/usr/local/j2sdk1.4.0/lib/rt.jar" />
@@ -25,7 +26,9 @@
         <mkdir dir="${javadoc.dir}" />
 
         <javadoc packagenames="org.openscience.cdk.*"
-                 sourcepath="." destdir="${javadoc.dir}"
+                 sourcepath="${src}" destdir="${javadoc.dir}"
+                 defaultexcludes="yes"
+                 author="true" version="true" use="true"
                  public="true">
             <classpath refid="project.class.path" />
         </javadoc>
diff --git a/packages/tar/cdk-bin/ChangeLog b/packages/tar/cdk-bin/ChangeLog
index 762b9e435cd..f75f9902f80 100644
--- a/packages/tar/cdk-bin/ChangeLog
+++ b/packages/tar/cdk-bin/ChangeLog
@@ -1,4 +1,4 @@
-20020723
+20020805
 =================
 * Updated cdk-view man page
 * Updated for cdk -> cdk-core + cdk-extra split
diff --git a/packages/tar/cdk-bin/VERSION b/packages/tar/cdk-bin/VERSION
index 8957d3c9610..ceeee595b5d 100644
--- a/packages/tar/cdk-bin/VERSION
+++ b/packages/tar/cdk-bin/VERSION
@@ -1 +1 @@
-20020723
+20020805
diff --git a/packages/tar/cdk-bin/configure.in b/packages/tar/cdk-bin/configure.in
index 851cb0b9861..a1942d713b5 100755
--- a/packages/tar/cdk-bin/configure.in
+++ b/packages/tar/cdk-bin/configure.in
@@ -5,6 +5,17 @@ AC_INIT()
 AM_INIT_AUTOMAKE(cdk-bin, `cat VERSION`)
 
 dnl deal with options
+SGMLDIR=""
+AC_ARG_WITH(sgmldir,
+      [  --with-sgmldir=DIR  where to find the SGML dir ],
+      [  if test -n "$withval"
+         then
+          SGMLDIR="$withval"
+         fi
+      ]
+)
+AC_SUBST(SGMLDIR)
+
 AC_ARG_WITH(xercesdir,
       [  --with-xercesdir=DIR  where to find the xerces.jar library
                                [/usr/share/java] ],
@@ -176,7 +187,7 @@ dnl detection copied from Lire 1.0 (www.logreport.org)
 dnl Try to find the SGML directory layout
 dnl Find a list of potential SGML/XML trees, we will look into subdirectories
 dnl of this one to find the DSSSL/DTD/XSLT stuff.
-sgmldirs=""
+sgmldirs=$SGMLDIR
 try_dirs="/usr/lib/sgml /usr/share/sgml /usr/local/lib/sgml /usr/local/share/sgml /usr/share/xml /usr/local/share/xml /usr/local/share/xsl"
 if test x"$prefix" != "xNONE"
 then
diff --git a/packages/tar/cdk-doc/ChangeLog b/packages/tar/cdk-doc/ChangeLog
index 8145cf27d44..c2885fa4ea0 100644
--- a/packages/tar/cdk-doc/ChangeLog
+++ b/packages/tar/cdk-doc/ChangeLog
@@ -1,3 +1,7 @@
+20020805
+=================
+* API for cdk.* 20020805
+
 20020518
 =================
 * first tar.gz release
diff --git a/packages/tar/cdk-doc/VERSION b/packages/tar/cdk-doc/VERSION
index 83db6355349..ceeee595b5d 100644
--- a/packages/tar/cdk-doc/VERSION
+++ b/packages/tar/cdk-doc/VERSION
@@ -1 +1 @@
-20020518
+20020805
diff --git a/packages/tar/cdk-doc/javadoc/Makefile.am b/packages/tar/cdk-doc/javadoc/Makefile.am
index d2979316589..74a850c73ce 100755
--- a/packages/tar/cdk-doc/javadoc/Makefile.am
+++ b/packages/tar/cdk-doc/javadoc/Makefile.am
@@ -17,7 +17,7 @@ alldoc_DATA = ${DOCTAR}
 
 javadoc.tar.gz:
 	cd ../../../..; ${ANT} -buildfile javadoc.xml html
-	cd ../../../..; ${TAR} cf javadoc.tar javadoc
-	cp ../../../../javadoc.tar .
+	cd ../../../../doc; ${TAR} cf javadoc.tar api
+	cp ../../../../doc/javadoc.tar .
 	${GZIP} -9 javadoc.tar
 
diff --git a/packages/tar/cdk-test/ChangeLog b/packages/tar/cdk-test/ChangeLog
index 1c8ebb6dd38..7e6a007b17c 100644
--- a/packages/tar/cdk-test/ChangeLog
+++ b/packages/tar/cdk-test/ChangeLog
@@ -1,3 +1,7 @@
+20020805
+=================
+* More tests
+
 20020308
 =================
 * first release
diff --git a/packages/tar/cdk-test/VERSION b/packages/tar/cdk-test/VERSION
index 33d8d12c720..ceeee595b5d 100644
--- a/packages/tar/cdk-test/VERSION
+++ b/packages/tar/cdk-test/VERSION
@@ -1 +1 @@
-20020308
+20020805
diff --git a/packages/tar/cdk-test/configure.in b/packages/tar/cdk-test/configure.in
index 319ef0b7975..35782c909fb 100755
--- a/packages/tar/cdk-test/configure.in
+++ b/packages/tar/cdk-test/configure.in
@@ -161,7 +161,6 @@ fi
 AC_SUBST(PATHTOXERCES)
 
 dnl needed for check_xml
-AC_PATH_PROGS(PATHTONSGMLS, onsgmls nsgmls, no)
 
 AC_OUTPUT([
    Makefile