diff --git a/doc/gpg.texi b/doc/gpg.texi
index 2ddc16342..f5a6fdd4d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2893,12 +2893,15 @@ Same as the command @option{--fingerprint} but changes only the format
 of the output and may be used together with another command.
 
 @item --with-subkey-fingerprint
+@itemx --without-subkey-fingerprint
 @opindex with-subkey-fingerprint
+@opindex without-subkey-fingerprint
 If a fingerprint is printed for the primary key, this option forces
 printing of the fingerprint for all subkeys.  This could also be
 achieved by using the @option{--with-fingerprint} twice but by using
-this option along with keyid-format "none" a compact fingerprint is
-printed.
+this option along with the default keyid-format "none" a compact
+fingerprint is printed.  Since version 2.6.0 this option is active by
+default; use the ``without'' variant to disable it.
 
 @item --with-v5-fingerprint
 @opindex with-v5-fingerprint
diff --git a/g10/gpg.c b/g10/gpg.c
index 0c80a558b..e8894ab4a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -206,6 +206,7 @@ enum cmd_and_opt_values
     oWithV5Fingerprint,
     oWithFingerprint,
     oWithSubkeyFingerprint,
+    oWithoutSubkeyFingerprint,
     oWithICAOSpelling,
     oWithKeygrip,
     oWithKeyScreening,
@@ -824,6 +825,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
   ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprint", "@"),
   ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprints", "@"),
+  ARGPARSE_s_n (oWithoutSubkeyFingerprint, "without-subkey-fingerprint", "@"),
   ARGPARSE_s_n (oWithICAOSpelling, "with-icao-spelling", "@"),
   ARGPARSE_s_n (oWithKeygrip,     "with-keygrip", "@"),
   ARGPARSE_s_n (oWithKeyScreening,"with-key-screening", "@"),
@@ -2503,6 +2505,7 @@ main (int argc, char **argv)
     opt.passphrase_repeat = 1;
     opt.emit_version = 0;
     opt.weak_digests = NULL;
+    opt.with_subkey_fingerprint = 1;
     opt.compliance = CO_GNUPG;
 
     /* Check special options given on the command line.  */
@@ -2909,6 +2912,9 @@ main (int argc, char **argv)
 	  case oWithSubkeyFingerprint:
             opt.with_subkey_fingerprint = 1;
             break;
+	  case oWithoutSubkeyFingerprint:
+            opt.with_subkey_fingerprint = 0;
+            break;
 	  case oWithICAOSpelling:
             opt.with_icao_spelling = 1;
             break;