diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9b230c87d..753bec334 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -710,8 +710,8 @@ mode. See the manual section ``Unattended key generation'' on how
 to use this.
 
 
-@item --generate-revocation-certificate @code{name}
-@opindex generate-revocation-certificate
+@item --generate-revocation @code{name}
+@opindex generate-revocation
 @itemx --gen-revoke @code{name}
 @opindex gen-revoke
 Generate a revocation certificate for the complete key.  To only revoke
diff --git a/g10/gpg.c b/g10/gpg.c
index 6003d04cd..7702bb32b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -459,7 +459,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aFullKeygen,  "full-generate-key" ,
               N_("full featured key pair generation")),
   ARGPARSE_c (aFullKeygen,  "full-gen-key", "@"),
-  ARGPARSE_c (aGenRevoke, "generate-revocation-certificate",
+  ARGPARSE_c (aGenRevoke, "generate-revocation",
 	      N_("generate a revocation certificate")),
   ARGPARSE_c (aGenRevoke, "gen-revoke", "@"),
   ARGPARSE_c (aDeleteKeys,"delete-keys",
@@ -4547,7 +4547,7 @@ main (int argc, char **argv)
 
       case aGenRevoke:
 	if( argc != 1 )
-	    wrong_args("--generate-revocation-certificate user-id");
+	    wrong_args("--generate-revocation user-id");
 	username =  make_username(*argv);
 	gen_revoke( username );
 	xfree( username );
diff --git a/g10/revoke.c b/g10/revoke.c
index 17c9b8c3a..591b641d3 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -571,7 +571,7 @@ gen_standard_revoke (PKT_public_key *psk, const char *cache_nonce)
        "the secret key.  However, if the secret key is still accessible,\n"
        "it is better to generate a new revocation certificate and give\n"
        "a reason for the revocation.  For details see the description of\n"
-       "of the gpg command \"--generate-revocation-certificate\" in the "
+       "of the gpg command \"--generate-revocation\" in the "
        "GnuPG manual."),
      _("To avoid an accidental use of this file, a colon has been inserted\n"
        "before the 5 dashes below.  Remove this colon with a text editor\n"
diff --git a/po/ca.po b/po/ca.po
index b4cd9c74a..6f383f4e4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5478,7 +5478,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/cs.po b/po/cs.po
index f2cb0d75c..7550f446d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5116,7 +5116,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Použijte jej pro odvolání tohoto klíče v případě zneužití nebo ztráty\n"
 "soukromého klíče. Avšak bude-li soukromý klíč stále přístupný, bude\n"
diff --git a/po/da.po b/po/da.po
index eed0e6c24..4aa7cfbe7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5373,7 +5373,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/de.po b/po/de.po
index 21dcc8700..3af991819 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5134,14 +5134,14 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Benutzen Sie es, um einen Schlüssel zu widerrufen, falls der private\n"
 "Schlüssel verloren wurde oder kompromittiert ist.  Falls jedoch auf\n"
 "den privaten Schlüssel noch zugegriffen werden kann, so ist es besser,\n"
 "ein neues Widerrufszertifikat zu erzeugen, um den Grund des Widerrufs\n"
 "mit angeben zu können.  Weitere Informationen finden Sie im GnuPG\n"
-"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation-certificate\"."
+"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation\"."
 
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/el.po b/po/el.po
index e2b238afd..7ac9e40c4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5360,7 +5360,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/eo.po b/po/eo.po
index 0e93051a0..ad0883920 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5328,7 +5328,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/es.po b/po/es.po
index 64e348e36..772b68590 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5366,7 +5366,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/et.po b/po/et.po
index 624735144..bde0be112 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5302,7 +5302,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/fi.po b/po/fi.po
index 83ba0c1d4..9fdf16224 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5350,7 +5350,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index d88ed3682..2e76dddcb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5237,7 +5237,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Utilisez-le pour révoquer cette clef en cas de compromis ou de\n"
 "perte de la clef secrète. Cependant, si la clef secrète est\n"
diff --git a/po/gl.po b/po/gl.po
index 0995161ed..95cfe9e1b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5359,7 +5359,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/hu.po b/po/hu.po
index d437321be..bcc5c30a0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5324,7 +5324,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/id.po b/po/id.po
index 5b6d49c7c..6ad3f702a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5316,7 +5316,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/it.po b/po/it.po
index 2ffcf83fe..ef271eb8e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5344,7 +5344,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index 676647095..228a959f5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4933,12 +4933,12 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "秘密鍵のコンプロマイズや紛失の場合、これを使ってこの鍵を失効させます。\n"
 "しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
 "失効の理由をつける方がよいでしょう。詳細は、GnuPGマニュアルのgpgコマンド \"--"
-"generate-revocation-certificate\"の記述をご覧ください。"
+"generate-revocation\"の記述をご覧ください。"
 
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/nb.po b/po/nb.po
index 770768ce6..63a153ca0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5008,13 +5008,13 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Bruk det for å oppheve denne nøkkelen hvis den blir kompromittert\n"
 "eller hvis du mister den hemmelige nøkkelen. Hvis du fremdeles har\n"
 "tilgang til den hemmelige nøkkelen, er det lurt å heller lage et nytt\n"
 "opphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
-"Se beskrivelse av kommandoen «--generate-revocation-certificate» i GnuPG-\n"
+"Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
 "bruksanvisninga for detaljer."
 
 msgid ""
diff --git a/po/pl.po b/po/pl.po
index a6650af5f..8421f3384 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5397,7 +5397,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/pt.po b/po/pt.po
index 51fdc52ec..fe98eaff1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5329,7 +5329,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/ro.po b/po/ro.po
index ce70c8940..c7d8e3f53 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5344,7 +5344,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 94052d005..2625e9c04 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5018,12 +5018,12 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
 "секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
 "новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
-"команды gpg \"--generate-revocation-certificate\" в руководстве по GnuPG."
+"команды gpg \"--generate-revocation\" в руководстве по GnuPG."
 
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/sk.po b/po/sk.po
index 4566b3b2b..ae5397962 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5337,7 +5337,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index ccc6ee5c2..5c364f877 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5463,7 +5463,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/tr.po b/po/tr.po
index 1ab27c971..2746f7c8e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5398,7 +5398,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/uk.po b/po/uk.po
index 4e8e7b599..6cf236065 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5117,14 +5117,14 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "Скористайтеся цим для відкликання цього ключа у випадку його\n"
 "компрометації або втрати закритої частини. Втім, якщо доступ до\n"
 "закритого ключа не втрачено, краще створити новий сертифікат\n"
 "відкликання і вказати причину відкликання. Докладніший опис\n"
 "можна знайти у розділах підручника з GnuPG щодо команди\n"
-"gpg «--generate-revocation-certificate»."
+"gpg «--generate-revocation»."
 
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 740a7e907..a067cf330 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5212,7 +5212,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
 msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 095561374..6762660b5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5001,7 +5001,7 @@ msgid ""
 "the secret key.  However, if the secret key is still accessible,\n"
 "it is better to generate a new revocation certificate and give\n"
 "a reason for the revocation.  For details see the description of\n"
-"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 "萬一私鑰外流或遺失時, 可以用來撤銷金鑰.\n"
 "然而, 如果其實還可以存取私鑰, 建議更好的\n"