2 files changed, 5 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0d008ca44..6e672871d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  David Shaw  <[email protected]>
+
+	* gpg.c (main): --pgp6 includes --disable-mdc.
+
 2009-07-23  David Shaw  <[email protected]>
 
 	* keyserver.c (keyserver_import_ldap): Try a DNS-SD lookup to find
diff --git a/g10/gpg.c b/g10/gpg.c
index 7f3163186..08c91106c 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3112,6 +3112,7 @@ main (int argc, char **argv)
       }
     else if(PGP6)
       {
+	opt.disable_mdc=1;
 	opt.escape_from=1;
 	opt.force_v3_sigs=1;
 	opt.ask_sig_expire=0;