diff --git a/ChangeLog b/ChangeLog
index 9ff4d2757..c11418b7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-01  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (AC_INIT): Fix quoting.
+
 2008-03-31  David Shaw  <dshaw@jabberwocky.com>
 
 	* configure.ac: Require curl 7.10 (Oct 1 2002) or later as we use
diff --git a/NEWS b/NEWS
index f90584ed6..789a65c7f 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Noteworthy changes in version 1.4.9 (2008-03-26)
       Decryption is also a bit faster.
 
     * Fixed possible memory corruption bug in 1.4.8 while importing
-      OpenPGP keys.
+      OpenPGP keys. [CVE-2008-1530]
 
 
 Noteworthy changes in version 1.4.8 (2007-12-20)
diff --git a/configure.ac b/configure.ac
index ead235ae8..f4c8bebe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,8 @@ m4_define([my_issvn], [yes])
 m4_define([svn_revision], m4_esyscmd([echo $((svn info 2>/dev/null \
           || echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)| \
           tr -d '\n']))
-AC_INIT([gnupg], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+AC_INIT([gnupg], 
+        [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
         [bug-gnupg@gnu.org])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4d380a70d..76373af05 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-30  Werner Koch  <wk@g10code.com>
+
+	* getkey.c (parse_auto_key_locate): Ignore nodefault and local
+	methods.
+
 2008-04-17  David Shaw  <dshaw@jabberwocky.com>
 
 	* parse-packet.c (parse_key): Add constant for Camellia-192.
diff --git a/g10/getkey.c b/g10/getkey.c
index 8cc1c9074..267eee541 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3008,6 +3008,12 @@ parse_auto_key_locate(char *options)
       if(tok[0]=='\0')
 	continue;
 
+      /* For now we silently ignore the new methods introduced with
+         2.0.10. */ 
+      if (!ascii_strcasecmp (tok,"nodefault")
+          || !ascii_strcasecmp (tok,"local"))
+        continue;
+
       akl=xmalloc_clear(sizeof(*akl));
 
       if(ascii_strcasecmp(tok,"ldap")==0)
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index 841850c20..bccdd0fb2 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -570,7 +570,7 @@ LangString T_About ${LANG_ENGLISH} \
   "GnuPG is GNU's tool for secure communication and data storage. \
   It can be used to encrypt data and to create digital signatures. \
   It includes an advanced key management facility and is compliant \
-  with the proposed OpenPGP Internet standard as described in RFC2440. \
+  with the proposed OpenPGP Internet standard as described in RFC4880. \
   \r\n\r\n$_CLICK \
   \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}\r\n\
   built on $%BUILDINFO%\r\n\