diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 76301eb31..0998418c1 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -3152,6 +3152,7 @@ static struct
 } cmds[] = {
   { "quit"    ,  cmdQUIT,       N_("quit this menu")},
   { "q"       ,  cmdQUIT,       NULL },
+  { "bye"     ,  cmdQUIT,       NULL },
   { "help"    ,  cmdHELP,       N_("show this help")},
   { "?"       ,  cmdHELP,       NULL },
   { "list"    ,  cmdLIST,       N_("list all available data")},
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 12b0d8686..746ac7daf 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1809,7 +1809,7 @@ main (int argc, char **argv)
                     }
                 }
             }
-          else if (!strcmp (cmd, "bye"))
+          else if (!strcmp (cmd, "bye") || !strcmp (cmd, "quit"))
             {
               break;
             }