diff --git a/g10/ChangeLog b/g10/ChangeLog
index c2216951b..ad72d5078 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-22  David Shaw  <dshaw@jabberwocky.com>
+
+	* mainproc.c (get_pka_address): Fix bug introduced as part of
+	sig_to_notation conversion.  Noted by Peter Palfradrer.
+
 2006-03-21  Werner Koch  <wk@g10code.com>
 
 	* cardglue.c (agent_scd_pksign): Allow the use of ripemd-160 along
diff --git a/g10/mainproc.c b/g10/mainproc.c
index dbe64c96e..38f57b151 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1347,7 +1347,7 @@ get_pka_address (PKT_signature *sig)
       /* For now we only use the first valid PKA notation. In future
 	 we might want to keep additional PKA notations in a linked
 	 list. */
-      if (is_valid_mailbox (pka->email))
+      if (is_valid_mailbox (nd->value))
 	{
 	  pka = xmalloc (sizeof *pka + strlen(nd->value));
 	  pka->valid = 0;