diff --git a/tools/gendist b/tools/gendist
index 0217e91c..67b76b40 100755
--- a/tools/gendist
+++ b/tools/gendist
@@ -1,14 +1,16 @@
 #!/bin/sh
 #
 #  Generate BIRD Distribution Archive
-#  (c) 2000--2003 Martin Mares <mj@ucw.cz>
+#  (c) 2000--2004 Martin Mares <mj@ucw.cz>
 #
 
 set -e
-autoconf
+AC=`if [ -x /usr/bin/autoconf2.50 ] ; then echo autoconf2.50 ; else echo autoconf ; fi`
+$AC
 ./configure
 make distclean
-autoconf
+$AC
+rm -rf autom4te.cache
 ( cd doc ; make docs ; make clean )
 VERSION=`sed <sysdep/config.h '/BIRD_VERSION/!d;s/^.*"\(.*\)"$/\1/'`
 REL=bird-$VERSION
@@ -18,13 +20,16 @@ echo Building $REL
 rm -rf $T/$REL $T/$DREL
 mkdir -p $T/$REL $T/$DREL $T/$DREL/doc
 cp -a . $T/$REL
-scp -C atrey.karlin.mff.cuni.cz:~mj/BIRD/CVSROOT/ChangeLog $T/$REL
+echo Generating ChangeLog
+cvs log | tools/cvslog >$T/$REL/ChangeLog
 mv $T/$REL/doc/*.ps $T/$DREL/doc
-rm -f $T/$REL/bird.conf
+rm -f $T/$REL/bird.conf*
 rm -rf `find $T/$REL -name CVS -o -name tmp` $T/$REL/{misc,rfc,doc/slides}
 ( cd $T ; tar czvvf $REL.tar.gz $REL )
 ( cd $T ; tar czvvf $DREL.tar.gz $DREL )
 rm -rf $T/$REL $T/$DREL
+echo -n "OK? "
+read OK
 echo Uploading to Atrey...
 scp $T/$REL.tar.gz $T/$DREL.tar.gz atrey.karlin.mff.cuni.cz:~ftp/pub/bird/
 echo Uploading to Regina...