1 files changed, 10 insertions, 2 deletions
diff --git a/g10/hkp.c b/g10/hkp.c
index 466be8172..1b0dac755 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -395,8 +395,7 @@ parse_hkp_index(IOBUF buffer,char *line)
 		  line+=4;
 		  break;
 		}
-
-	      if((*(line+1)!='\0' && tolower(*(line+1))=='g') &&
+	      else if((*(line+1)!='\0' && tolower(*(line+1))=='g') &&
 		 (*(line+2)!='\0' && tolower(*(line+2))=='t') &&
 		 (*(line+3)!='\0' && *(line+3)==';'))
 		{
@@ -404,6 +403,15 @@ parse_hkp_index(IOBUF buffer,char *line)
 		  line+=4;
 		  break;
 		}
+	      else if((*(line+1)!='\0' && tolower(*(line+1))=='a') &&
+		 (*(line+2)!='\0' && tolower(*(line+2))=='m') &&
+		 (*(line+3)!='\0' && tolower(*(line+3))=='p') &&
+		 (*(line+4)!='\0' && *(line+4)==';'))
+		{
+		  uid[uidindex++]='&';
+		  line+=5;
+		  break;
+		}
 
 	    default:
 	      uid[uidindex++]=*line;