diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index c769ba711..1d3e681ee 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-22  Werner Koch  <wk@g10code.com>
+
+	* mk-w32-dist: Remove underline markup from man pages.  Reported
+	by Dirk Traulsen.
+
+2007-05-03  Werner Koch  <wk@g10code.com>
+
+	* autogen.sh: Modernized.  Removed autopoint invocation.  This
+	should be done by the maintainer and the put into the SVN.
+
 2006-12-13  Werner Koch  <wk@g10code.com>
 
 	* gnupg.spec.in: Distribute gnupg1.info.
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 3f687cafd..4b03b9bb7 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -127,11 +127,11 @@ for i in FAQ; do
   cp ${bindir}/doc/$i $i.txt
   todos $i.txt
 done
-man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
+man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/_\b//g;s/\b.//g"`  >gpg.man
 todos gpg.man
-man -Tlatin1 -l ${srcdir}/doc/gpgv.1 | sed `printf "s/\b.//g"`  >gpgv.man
+man -Tlatin1 -l ${srcdir}/doc/gpgv.1 | sed `printf "s/_\b//g;s/\b.//g"`  >gpgv.man
 todos gpgv.man
-man -Tlatin1 -l ${srcdir}/doc/gnupg.7 | sed `printf "s/\b.//g"`  >gnupg.man
+man -Tlatin1 -l ${srcdir}/doc/gnupg.7 | sed `printf "s/_\b//g;s/\b.//g"`  >gnupg.man
 todos gnupg.man
 for i in README COPYING NEWS; do
   cp ${srcdir}/$i $i.txt