diff --git a/AUTHORS b/AUTHORS
index 22df2a5e4..43c383098 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,13 +8,18 @@ Birger Langkjer <birger.langkjer@image.dk> Translations [da]
 
 Daniel Resare  <daniel@resare.com> xxxx [sv]
 
+David Shaw <dshaw@jabberwocky.com> Assignment
+    (all in keyserver/,
+     a lot of changes in g10/ see the ChangeLog,
+     bug fixes here and there)           
+
+Edmund GRIMLEY EVANS <edmundo@rano.org> Translations [eo]
+
 Gaël Quéri  <gqueri@mail.dotcom.fr>  Translations [fr]
     (fixed a lot of typos)
 
 Gregory Steuck <steuck@iname.com> Translations [ru]
 
-Edmund GRIMLEY EVANS <edmundo@rano.org> Translations [eo]
-
 Ivo Timmermans <itimmermans@bigfoot.com> Translations [nl]
 
 Janusz Aleksander Urbanowicz <alex@bofh.torun.pl> Translations [po]
diff --git a/THANKS b/THANKS
index 64134f180..532d62b70 100644
--- a/THANKS
+++ b/THANKS
@@ -188,6 +188,7 @@ Thomas Mikkelsen	   tbm@image.dk
 Ulf Möller		   3umoelle@informatik.uni-hamburg.de
 Urko Lusa		   ulusa@euskalnet.net
 Vincent P. Broman          broman@spawar.navy.mil
+W Lewis                    wiml@hhhh.org
 Walter Hofmann		   Walter.Hofmann@physik.stud.uni-erlangen.de
 Walter Koch		   koch@hsp.de
 Wayne Chapeskie 	   waynec@spinnaker.com
diff --git a/TODO b/TODO
index 4edeafdb4..6fdf68285 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,8 @@
 
+  * Update the manual pages (David's new features)
+
+  * update GPH
+
   * pause scrolling help in --edit-key and elsewhere.
 
   * getkey does not return revoked/expired keys - therefore it is not
@@ -74,11 +78,6 @@
   * --passphrase-fd  can't work with -cs: document this or find a way
     to work around.
 
-  * export by user-IDs does only export the first matching name which leads
-    to a problem in cases where there are 2 keys with identically
-    user-IDs. 
-    --> Check whether this is still true - yes it is.
-    
   * With option -i prompt before adding a key to the keyring and show some
     info what we are about to add.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 3c97f378b..d7f2135f6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,7 +43,7 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,
     fi
   ])
 
-w
+
 dnl GNUPG_CHECK_GNUMAKE
 dnl
 AC_DEFUN(GNUPG_CHECK_GNUMAKE,
diff --git a/configure.ac b/configure.ac
index d244fa0f1..260cf6eba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,7 +488,7 @@ AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe)
 
 #
 # check for gethrtime and run a testprogram to see whether
-# it is brogen.  It has been reported that some Solris and HP UX systems 
+# it is broken.  It has been reported that some Solaris and HP UX systems 
 # raise an SIGILL
 #
 AC_CACHE_CHECK([for gethrtime],