diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5e3e2bb81..82dcd3804 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-27  David Shaw  <dshaw@jabberwocky.com>
 
+	* sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign
+	--symmetric messages.
+
 	* mainproc.c (proc_symkey_enc), seckey-cert.c (do_check): Check
 	the S2K hash algorithm before we try to generate a passphrase
 	using it.  This prevents hitting BUG() when generating a
diff --git a/g10/sign.c b/g10/sign.c
index 25f08faf4..86a524b2b 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1064,6 +1064,13 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
         goto leave;
     }
 
+    /* We have no way to tell if the recipient can handle messages
+       with an MDC, so this defaults to no.  Perhaps in a few years,
+       this can be defaulted to yes.  Note that like regular
+       encrypting, --force-mdc overrides --disable-mdc. */
+    if(opt.force_mdc)
+      cfx.dek->use_mdc=1;
+
     /* now create the outfile */
     rc = open_outfile (fname, opt.armor? 1:0, &out);
     if (rc)