diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3b5167d04..c5068b982 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1073,8 +1073,8 @@ you want to specify a different revocation reason, or to supply
 supplementary revocation text, you should use the interactive
 sub-command @code{revuid} of @option{--edit-key}.
 
-@item --passwd @var{user_id}
-@opindex passwd
+@item --change-passphrase @var{user_id}
+@opindex change-passphrase
 Change the passphrase of the secret key belonging to the certificate
 specified as @var{user_id}.  This is a shortcut for the sub-command
 @code{passwd} of the edit key menu.
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 2e53a5674..d7d3770bd 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -283,8 +283,8 @@ Read information about the private keys from the smartcard and import
 the certificates from there.  This command utilizes the @command{gpg-agent}
 and in turn the @command{scdaemon}.
 
-@item --passwd @var{user_id}
-@opindex passwd
+@item --change-passphrase @var{user_id}
+@opindex change-passphrase
 Change the passphrase of the private key belonging to the certificate
 specified as @var{user_id}.  Note, that changing the passphrase/PIN of a
 smartcard is not yet supported.
diff --git a/g10/gpg.c b/g10/gpg.c
index a586388ac..6003d04cd 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -474,7 +474,8 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aLSignKey, "lsign-key"  ,N_("sign a key locally")),
   ARGPARSE_c (aEditKey,  "edit-key"   ,N_("sign or edit a key")),
   ARGPARSE_c (aEditKey,  "key-edit"   ,"@"),
-  ARGPARSE_c (aPasswd,   "passwd",     N_("change a passphrase")),
+  ARGPARSE_c (aPasswd,   "change-passphrase", N_("change a passphrase")),
+  ARGPARSE_c (aPasswd,   "passwd", "@"),
   ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
   ARGPARSE_c (aExport, "export"           , N_("export keys") ),
   ARGPARSE_c (aSendKeys, "send-keys"     , N_("export keys to a keyserver") ),
@@ -4243,7 +4244,7 @@ main (int argc, char **argv)
 
       case aPasswd:
         if (argc != 1)
-          wrong_args (_("--passwd <user-id>"));
+          wrong_args (_("--change-passphrase <user-id>"));
         else
           {
             username = make_username (fname);
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index a2ec441d6..79508e626 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -231,7 +231,8 @@ static ARGPARSE_OPTS opts[] = {
               N_("pass a command to the dirmngr")),
   ARGPARSE_c (aCallProtectTool, "call-protect-tool",
               N_("invoke gpg-protect-tool")),
-  ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")),
+  ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
+  ARGPARSE_c (aPasswd, "passwd", "@"),
   ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
   ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
 
@@ -1995,7 +1996,7 @@ main ( int argc, char **argv)
 
     case aPasswd:
       if (argc != 1)
-        wrong_args ("--passwd <key-Id>");
+        wrong_args ("--change-passphrase <key-Id>");
       else
         {
           int rc;