diff --git a/g10/call-agent.c b/g10/call-agent.c
index a0c5f811f..3b4882b53 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -839,7 +839,7 @@ agent_scd_keypairinfo (ctrl_t ctrl, strlist_t *r_list)
   memset (&inq_parm, 0, sizeof inq_parm);
   inq_parm.ctx = agent_ctx;
 
-  err = assuan_transact (agent_ctx, "SCD LEARN --force",
+  err = assuan_transact (agent_ctx, "SCD LEARN --keypairinfo",
                          NULL, NULL,
                          default_inq_cb, &inq_parm,
                          scd_keypairinfo_status_cb, &list);
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 1e904b578..c5ca063f7 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -987,6 +987,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
     { "PRIVATE-DO-3", 0x0103 },
     { "PRIVATE-DO-4", 0x0104 },
     { "$AUTHKEYID",   0x0000, -3 },
+    { "$ENCRKEYID",   0x0000, -6 },
+    { "$SIGNKEYID",   0x0000, -7 },
     { "$DISPSERIALNO",0x0000, -4 },
     { "UIF-1",        0x00D6, 0 },
     { "UIF-2",        0x00D7, 0 },
@@ -1071,6 +1073,18 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
         send_key_attr (ctrl, app, table[idx].name, i);
       return 0;
     }
+  if (table[idx].special == -6)
+    {
+      char const tmp[] = "OPENPGP.2";
+      send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+      return 0;
+    }
+  if (table[idx].special == -7)
+    {
+      char const tmp[] = "OPENPGP.1";
+      send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+      return 0;
+    }
 
   relptr = get_one_do (app, table[idx].tag, &value, &valuelen, &rc);
   if (relptr)
diff --git a/scd/app-piv.c b/scd/app-piv.c
index 41fd7b7c5..addc22c17 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -812,7 +812,9 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
     int special;
   } table[] = {
     { "SERIALNO",     0x0000, -1 },
-    { "$AUTHKEYID",   0x0000, -2 }, /* Default key for ssh.  */
+    { "$AUTHKEYID",   0x0000, -2 }, /* Default ssh key.  */
+    { "$ENCRKEYID",   0x0000, -6 }, /* Default encryption key.  */
+    { "$SIGNKEYID",   0x0000, -7 }, /* Default signing key.  */
     { "$DISPSERIALNO",0x0000, -3 },
     { "CHV-STATUS",   0x0000, -4 },
     { "CHV-USAGE",    0x007E, -5 }
@@ -883,6 +885,16 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
           xfree (relptr);
         }
     }
+  else if (table[idx].special == -6)
+    {
+      char const tmp[] = "PIV.9D"; /* Key Management.  */
+      send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+    }
+  else if (table[idx].special == -7)
+    {
+      char const tmp[] = "PIV.9C"; /* Digital Signature.  */
+      send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+    }
   else
     {
       relptr = get_one_do (app, table[idx].tag, &value, &valuelen, &err);
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 4c3eecb10..1fbb449bc 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -836,7 +836,7 @@ gpgsm_agent_scd_keypairinfo (ctrl_t ctrl, strlist_t *r_list)
   inq_parm.ctrl = ctrl;
   inq_parm.ctx = agent_ctx;
 
-  rc = assuan_transact (agent_ctx, "SCD LEARN --force",
+  rc = assuan_transact (agent_ctx, "SCD LEARN --keypairinfo",
                         NULL, NULL,
                         default_inq_cb, &inq_parm,
                         scd_keypairinfo_status_cb, &list);