diff --git a/doc/ChangeLog b/doc/ChangeLog
index d7a2e0c66..d618a29a2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-05  Werner Koch  <wk@gnupg.org>
+
+	* gpg.sgml: Document --no-mangle-dos-filenames.
+
 2002-12-04  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Document --pgp8.  Clarify that --pgp6 and --pgp7
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index eb44cf50c..d7647da0a 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -753,6 +753,19 @@ Create ASCII armored output.
 Write output to &ParmFile;.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--no-mangle-dos-filenames</term>
+<term>--mangle-dos-filenames</term>
+<listitem><para>
+The Windows version of GPG replaces the extension of an output
+filename to avoid problems with filenames containing more than one
+dot. This is not necessary for newer Windows version and such
+--no-mangle-dos-filenames can be used to switch this feature off and 
+have GPG append the new extension.   This otion has no effect on
+non-windows platforms.
+</para></listitem></varlistentry>
+
+
 
 <varlistentry>
 <term>-u, --local-user &ParmName;</term>