diff --git a/ChangeLog b/ChangeLog
index a3721d3f0..3efbb4673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* NEWS: Note the addition of preferred keyserver support,
+	--ask-cert-level, --keyid-format, and the removal of
+	show-long-keyids, the quasi-1991 partial length encoding,
+	--export-all, and include-non-rfc.
+
+	* acinclude.m4 (GNUPG_SYS_NM_PARSE): Remove a leftover slash in a
+	sed expression.
+
 2004-05-01  Werner Koch  <wk@gnupg.org>
 
 	* acinclude.m4 (ac_pipe_works): Fixed BRE syntax \? -> \{0,1\}.
diff --git a/NEWS b/NEWS
index 2a5dd6a2e..2b4bbfce3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,39 @@
 Noteworthy changes in version 1.3.6
 ------------------------------------------------
 
+    * New --keyid-format option that selects short (99242560), long
+      (DB698D7199242560), 0xshort (0x99242560), or 0xlong
+      (0xDB698D7199242560) keyid displays.  This lets users tune the
+      display to what they prefer.
+
+    * The --list-options and --verify-options option
+      "show-long-keyids" has been removed since --keyid-format
+      obviates the need for them.
+
+    * Support for the old quasi-1991 partial length encoding has been
+      removed.
+
+    * The --export-all and --export-options include-non-rfc options
+      have been removed as superfluous since nonstandard V3 Elgamal
+      sign+encrypt keys have been removed.
+
+    * Preferred keyserver support has been added.  Users may set a
+      preferred keyserver via the --edit-key command "keyserver".  If
+      the --keyserver-option honor-keyserver-url is set (and it is by
+      default), then the preferred keyserver is used when refreshing
+      that key.
+
+    * New --ask-cert-level/--no-ask-cert-level option to turn on and
+      off the prompt for signature level when signing a key.  Defaults
+      to off.
+
 
 Noteworthy changes in version 1.3.5 (2004-02-26)
 ------------------------------------------------
 
     * New --min-cert-level option to disregard key signatures that are
-      under a specified level.
+      under a specified level.  Defaults to 2 (i.e. discard 0x11
+      signatures).
 
     * New --max-output option to limit the amount of plaintext output
       generated by GnuPG.  This option can be used by programs which
@@ -36,9 +63,9 @@ Noteworthy changes in version 1.3.5 (2004-02-26)
       --symmetric messages.
 
     * The configure options --enable-rsa and --disable-rsa can now be
-      used to enable or disable RSA support.  This can be useful for
-      embedded use where space is tight.  --enable-minimal includes
-      --disable-rsa.
+      used to enable or disable the RSA algorithm.  This can be useful
+      for embedded use where space is tight.  --enable-minimal
+      includes --disable-rsa.  RSA is enabled by default.
 
     * The last support for Elgamal sign+encrypt keys has been removed.
 
diff --git a/acinclude.m4 b/acinclude.m4
index e69a464b1..68b269bea 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -609,7 +609,7 @@ dld_preloaded_symbols[] =
 changequote([,])dnl
 {
 EOF
-        sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+        sed 's/^_\{0,1\}\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
         cat <<\EOF >> conftest.c
   {0, (__ptr_t) 0}
 };