diff --git a/doc/gpg.texi b/doc/gpg.texi
index a41ab8e0c..12a6d60d5 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2338,9 +2338,9 @@ protected by the signature.
 @opindex emit-version
 Force inclusion of the version string in ASCII armored output.  If
 given once only the name of the program and the major number is
-emitted (default), given twice the minor is also emitted, given triple
+emitted, given twice the minor is also emitted, given triple
 the micro is added, and given quad an operating system identification
-is also emitted.  @option{--no-emit-version} disables the version
+is also emitted.  @option{--no-emit-version} (default) disables the version
 line.
 
 @item --sig-notation @code{name=value}
diff --git a/g10/gpg.c b/g10/gpg.c
index 72d313b49..236ea1e66 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1911,7 +1911,7 @@ main (int argc, char **argv )
     opt.def_cert_expire="0";
     set_homedir ( default_homedir () );
     opt.passwd_repeat=1;
-    opt.emit_version = 1; /* Limit to the major number.  */
+    opt.emit_version = 0;
 
 #ifdef ENABLE_CARD_SUPPORT
 #if defined(_WIN32) || defined(__CYGWIN__)