Index: gnupg/sm/ChangeLog
===================================================================
--- gnupg/sm/ChangeLog
+++ gnupg/sm/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10 FIXME
+
+	* gpgsm.c: change option from "delete-key" to "delete-keys" to match
+	code, behaviour and documentation. From Bernhard Reiter.
+
 2008-09-30  Werner Koch  <wk@g10code.com>
 
 	* server.c (cmd_getinfo): New subcommand agent-check.
Index: gnupg/sm/gpgsm.c
===================================================================
--- gnupg/sm/gpgsm.c
+++ gnupg/sm/gpgsm.c
@@ -72,7 +72,7 @@
   aLSignKey,
   aListPackets,
   aEditKey,
-  aDeleteKey,
+  aDeleteKeys,
   aImport,
   aVerify,
   aVerifyFiles,
@@ -259,7 +259,7 @@
     { aListChain,   "list-chain",  256, N_("list certificate chain")}, 
     { oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")},
     { aKeygen,	   "gen-key",  256, "@" },
-    { aDeleteKey, "delete-key",256, N_("remove key from the public keyring")},
+    { aDeleteKeys,"delete-keys",256,N_("remove keys from the public keyring")},
     { aSendKeys, "send-keys"     , 256, N_("export keys to a key server") },
     { aRecvKeys, "recv-keys"     , 256, N_("import keys from a key server") },
     { aImport, "import",      256     , N_("import certificates")},
@@ -1103,8 +1103,8 @@
           do_not_setup_keys = 1;
           break;
         
-        case aDeleteKey:
-          set_cmd (&cmd, aDeleteKey);
+        case aDeleteKeys:
+          set_cmd (&cmd, aDeleteKeys);
           /*greeting=1;*/
           do_not_setup_keys = 1;
           break;
@@ -1825,7 +1825,7 @@
       }
       break;
 
-    case aDeleteKey:
+    case aDeleteKeys:
       for (sl=NULL; argc; argc--, argv++)
         add_to_strlist (&sl, *argv);
       gpgsm_delete (&ctrl, sl);