diff --git a/g10/encrypt.c b/g10/encrypt.c
index a524326bb..00d9a0c44 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -1146,6 +1146,12 @@ write_pubkey_enc (ctrl_t ctrl,
       if ( opt.verbose )
         {
           char *ustr = get_user_id_string_native (ctrl, enc->keyid);
+          if ((pk->pubkey_usage & PUBKEY_USAGE_RENC))
+            {
+              char *tmpustr = xstrconcat (ustr, " [ADSK]", NULL);
+              xfree (ustr);
+              ustr = tmpustr;
+            }
           log_info (_("%s/%s.%s encrypted for: \"%s\"\n"),
                     openpgp_pk_algo_name (enc->pubkey_algo),
                     openpgp_cipher_algo_name (dek->algo),
diff --git a/g10/getkey.c b/g10/getkey.c
index 68d7ee61d..21ffd5cfa 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3640,24 +3640,31 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
   log_assert (keyblock->pkt->pkttype == PKT_PUBLIC_KEY);
 
   /* For an exact match mark the primary or subkey that matched the
-     low-level search criteria.  */
-  if (want_exact)
+   * low-level search criteria.  Use this loop also to sort our keys
+   * found using an ADSK fingerprint.  */
+  for (k = keyblock; k; k = k->next)
     {
-      for (k = keyblock; k; k = k->next)
-	{
-	  if ((k->flag & 1))
-	    {
-	      log_assert (k->pkt->pkttype == PKT_PUBLIC_KEY
-                          || k->pkt->pkttype == PKT_PUBLIC_SUBKEY);
-	      foundk = k;
+      if ((k->flag & 1) && (k->pkt->pkttype == PKT_PUBLIC_KEY
+                            || k->pkt->pkttype == PKT_PUBLIC_SUBKEY))
+        {
+          if (want_exact)
+            {
+              if (DBG_LOOKUP)
+                log_debug ("finish_lookup: exact search requested and found\n");
+              foundk = k;
               pk = k->pkt->pkt.public_key;
               pk->flags.exact = 1;
-	      break;
-	    }
-	}
-      if (DBG_LOOKUP)
-        log_debug ("finish_lookup: exact search requested: %sfound\n",
-                   foundk? "":"not ");
+              break;
+            }
+          else if ((k->pkt->pkt.public_key->pubkey_usage == PUBKEY_USAGE_RENC))
+            {
+              if (DBG_LOOKUP)
+                log_debug ("finish_lookup: found via ADSK - not selected\n");
+              if (r_flags)
+                *r_flags |= LOOKUP_NOT_SELECTED;
+              return NULL; /* Not found.  */
+            }
+        }
     }
 
   /* Get the user id that matched that low-level search criteria.  */