diff --git a/CHANGELOG b/CHANGELOG
index df24916..8c0132c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,8 @@ Version 0.7.1   - UNRELEASED
     actually switched them before. Closes: #1762907
   * The automatic seteuid feature of archivemail is insecure and thus
     deprecated; it will be removed from later versions. 
+  * Expand tilde in argument of long option --pwfile. (Thanks Christian
+    Brabandt) Closes: Debian bug #434813
 
 Version 0.7.0   - 2 November 2006
   * Fixed long options --filter-append and --pwfile to accept their arguments.
diff --git a/archivemail.py b/archivemail.py
index d0e1578..b52187e 100755
--- a/archivemail.py
+++ b/archivemail.py
@@ -242,7 +242,7 @@ class Options:
             if o in ('-o', '--output-dir'):
                 self.output_dir = os.path.expanduser(a)
             if o in ('-P', '--pwfile'):
-                self.pwfile = a
+                self.pwfile = os.path.expanduser(a)
             if o in ('-F', '--filter-append'):
                 self.filter_append = a
             if o in ('-h', '-?', '--help'):