diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index b0b74f8bf..a4bc67f72 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-01  Werner Koch  <wk@gnupg.org>
+
+	* mk-gpg-texi: New.
+
 2002-06-30  Werner Koch  <wk@gnupg.org>
 
 	* mk-w32-dist (bindir): Fixes vor VPATH builds in a subdir,
diff --git a/scripts/distfiles b/scripts/distfiles
index 6a1ef2666..753d15fb9 100644
--- a/scripts/distfiles
+++ b/scripts/distfiles
@@ -2,4 +2,5 @@ mkdiff
 build-w32
 gnupg.spec.in
 autogen.sh
+mg-gpg-texi
 
diff --git a/scripts/mk-gpg-texi b/scripts/mk-gpg-texi
new file mode 100755
index 000000000..45a811742
--- /dev/null
+++ b/scripts/mk-gpg-texi
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Helper to create the texinfo versions from gpg.sgml
+#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set -e
+
+for file in gpg gpgv; do
+  sgml2xml -x lower ${file}.sgml >${file}.xml
+  docbook2texi ${file}.xml | sed 's,--,---,' | (
+  case "$file" in
+    *gpgv)
+        sed '/@setfilename/a \
+@dircategory GnuPG\
+@direntry\
+* gpgv: (gpgv).                       GnuPG signature verification tool.\
+@end direntry
+'
+         ;;
+
+    gpg)
+        sed '/@setfilename/a \
+@dircategory GnuPG\
+@direntry\
+* gpg: (gpg).                         GnuPG encryption and signing tool.\
+@end direntry
+'
+        ;;
+
+    *)
+    cat
+        ;;
+  esac
+  ) >${file}.texi 
+done
+
+
+