diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 6ffddfac6..865ffc2c4 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-30  David Shaw  <dshaw@jabberwocky.com>
+
+	* convert-from-106: Script to automate the 1.0.6->later
+	conversion.  It marks all secret keys as ultimately trusted, adds
+	the signature caches, and checks the trustdb.
+
 2002-11-12  Werner Koch  <wk@gnupg.org>
 
 	* config.sub, config.guess: Updated from ftp.gnu.org/gnu/config
@@ -305,5 +311,3 @@ Wed Oct 14 09:55:25 1998  Werner Koch  (wk@isil.d.shuttle.de)
  This file 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.
-
-
diff --git a/scripts/convert-from-106 b/scripts/convert-from-106
new file mode 100755
index 000000000..26fe34fc9
--- /dev/null
+++ b/scripts/convert-from-106
@@ -0,0 +1,46 @@
+#!/bin/sh
+# 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.
+
+gpg="../g10/gpg --no-greeting --no-secmem-warning";
+
+echo "This script converts your public keyring and trustdb from GnuPG"
+echo "1.0.6 or earlier to the 1.0.7 and later format."
+
+echo "If you have already done this, there is no harm (but no point)"
+echo "in doing it again."
+
+echo -n "Continue? (y/N)"
+
+read answer
+
+if test "x$answer" != "xy" ; then
+  exit 0
+fi
+
+echo
+echo "Marking your keys as ultimately trusted"
+for key in `$gpg --with-colons --list-secret-keys | grep sec: | cut -d: -f5`
+do
+  $gpg --trusted-key $key --with-colons --list-keys $key > /dev/null 2>&1
+  echo -n "."
+done
+echo
+
+echo
+echo "Adding signature caches"
+$gpg --rebuild-keydb-caches
+
+echo
+echo "Checking trustdb"
+$gpg --check-trustdb
+
+echo
+echo "Done!"