diff --git a/archivemail.1 b/archivemail.1
index f7161c3..3285771 100644
--- a/archivemail.1
+++ b/archivemail.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "ARCHIVEMAIL" "1" "19 October 2006" "SP" ""
+.TH "ARCHIVEMAIL" "1" "30 October 2006" "SP" ""
 
 .SH NAME
 archivemail \- archive and compress your old email
@@ -177,7 +177,7 @@ message has been read. \fBarchivemail\fR determines if a
 been read by looking at the filename. If the filename contains an 'S' after 
 \fI:2,\fR then it assumes the message has been read.
 .TP
-\fB    --dont-mangle-from\fR
+\fB    --dont-mangle\fR
 Do not mangle lines in message bodies beginning with "From ".  When archiving
 a message from a mailbox not in \fBmbox\fR format, by default
 \fBarchivemail\fR mangles such lines by prepending a '>' to them, since mail
diff --git a/archivemail.py b/archivemail.py
index fb7bd8a..ccebc38 100755
--- a/archivemail.py
+++ b/archivemail.py
@@ -195,7 +195,7 @@ class Options:
             opts, args = getopt.getopt(args, '?D:S:Vd:hno:F:P:qs:uv', 
                              ["date=", "days=", "delete", "dry-run", "help",
                              "include-flagged", "no-compress", "output-dir=",
-                             "filter-append=", "pwfile=", "dont-mangle-from",
+                             "filter-append=", "pwfile=", "dont-mangle",
                              "preserve-unread", "quiet", "size=", "suffix=",
                              "verbose", "version", "warn-duplicate"])
         except getopt.error, msg:
@@ -241,7 +241,7 @@ class Options:
                 self.min_size = string.atoi(a)
             if o in ('-u', '--preserve-unread'):
                 self.preserve_unread = 1
-            if o == '--dont-mangle-from':
+            if o == '--dont-mangle':
                 self.mangle_from = 0
             if o in ('-v', '--verbose'):
                 self.verbose = 1
@@ -653,7 +653,7 @@ Options are as follows:
   -S, --size=NUM        only archive messages NUM bytes or larger
   -n, --dry-run         don't write to anything - just show what would be done
   -u, --preserve-unread never archive unread messages
-      --dont-mangle-from  do not mangle From_ in message bodies
+      --dont-mangle     do not mangle From_ in message bodies
       --delete          delete rather than archive old mail (use with caution!)
       --include-flagged messages flagged important can also be archived
       --no-compress     do not compress archives with gzip
diff --git a/archivemail.sgml b/archivemail.sgml
index 9ef95b7..c526d95 100644
--- a/archivemail.sgml
+++ b/archivemail.sgml
@@ -35,7 +35,7 @@
 
 <RefEntry>
 
-<DocInfo><Date>13 October 2006</Date></DocInfo>
+<DocInfo><Date>30 October 2006</Date></DocInfo>
 
 <RefMeta>
 <RefEntryTitle>archivemail</RefEntryTitle>
@@ -248,7 +248,7 @@ been read by looking at the filename. If the filename contains an 'S' after
 
 <VarListEntry>
 <Term>
-    <Option>--dont-mangle-from</Option>
+    <Option>--dont-mangle</Option>
 </Term>
 <ListItem><Para>
 Do not mangle lines in message bodies beginning with "From ".  When archiving